From 1fce7a5fa80a584de8d306923ae0fcf49e33dad2 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 27 Dec 2021 15:42:34 +0800 Subject: [PATCH 01/75] Develop (#648) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update error log * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * Prod api (#647) * add getBalanceList * update getBalanceList * remove h2 Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin --- common/nuls-core-h2/pom.xml | 72 -- .../io/nuls/core/h2/common/BaseMapper.java | 104 --- .../interceptor/TransactionInterceptor.java | 77 -- .../transactional/annotation/PROPAGATION.java | 42 -- .../transactional/annotation/Transaction.java | 38 - .../java/io/nuls/core/h2/utils/Condition.java | 184 ----- .../core/h2/utils/DruidDataSourceBuilder.java | 10 - .../nuls/core/h2/utils/MybatisDbHelper.java | 37 - .../io/nuls/core/h2/utils/SearchOperator.java | 66 -- .../io/nuls/core/h2/utils/Searchable.java | 105 --- .../main/resources/mybatis/mybatis-config.xml | 93 --- .../java/io/nuls/core/h2/CreateTable.java | 103 --- .../src/test/java/io/nuls/core/h2/H2Test.java | 64 -- .../io/nuls/core/h2/dao/BaseDataService.java | 95 --- .../nuls/core/h2/dao/TransactionService.java | 35 - .../io/nuls/core/h2/dao/impl/BaseService.java | 52 -- .../h2/dao/impl/TransactionServiceImpl.java | 90 --- .../core/h2/dao/impl/mapper/CommonMapper.java | 34 - .../core/h2/dao/impl/mapper/CommonMapper.xml | 32 - .../h2/dao/impl/mapper/TransactionMapper.java | 21 - .../h2/dao/impl/mapper/TransactionMapper.xml | 39 - .../io/nuls/core/h2/entity/TransactionPO.java | 83 --- .../java/io/nuls/core/h2/entity/TxTable.java | 36 - .../src/test/resources/db_config.properties | 20 - .../mybatis/mapping/CommonMapper.xml | 32 - .../resources/mybatis/mybatis-config-bak.xml | 9 - .../src/test/resources/sql/schema-h2-bak.sql | 174 ----- .../src/test/resources/sql/schema-h2.sql | 0 common/pom.xml | 1 - .../nuls/provider/rpctools/LegderTools.java | 4 +- .../test/java/io/nuls/test/TxSendTester.java | 693 +++++++++++++++++- module/nuls-transaction/pom.xml | 5 - 32 files changed, 687 insertions(+), 1763 deletions(-) delete mode 100644 common/nuls-core-h2/pom.xml delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/common/BaseMapper.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/interceptor/TransactionInterceptor.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/PROPAGATION.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/Transaction.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Condition.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/DruidDataSourceBuilder.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/MybatisDbHelper.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/SearchOperator.java delete mode 100644 common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Searchable.java delete mode 100644 common/nuls-core-h2/src/main/resources/mybatis/mybatis-config.xml delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/CreateTable.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/H2Test.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/BaseDataService.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/TransactionService.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/BaseService.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/TransactionServiceImpl.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.xml delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.xml delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TransactionPO.java delete mode 100644 common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TxTable.java delete mode 100644 common/nuls-core-h2/src/test/resources/db_config.properties delete mode 100644 common/nuls-core-h2/src/test/resources/mybatis/mapping/CommonMapper.xml delete mode 100644 common/nuls-core-h2/src/test/resources/mybatis/mybatis-config-bak.xml delete mode 100644 common/nuls-core-h2/src/test/resources/sql/schema-h2-bak.sql delete mode 100644 common/nuls-core-h2/src/test/resources/sql/schema-h2.sql diff --git a/common/nuls-core-h2/pom.xml b/common/nuls-core-h2/pom.xml deleted file mode 100644 index c90c263b0b..0000000000 --- a/common/nuls-core-h2/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - common - io.nuls.v2 - 1.0.0-SNAPSHOT - - 4.0.0 - nuls-core-h2 - - - UTF-8 - 11 - 1.2.3 - - - - - - io.nuls.v2 - nuls-core - 1.0.0-SNAPSHOT - - - com.alibaba - druid - 1.1.19 - - - - org.mybatis - mybatis - 3.5.6 - - - com.github.pagehelper - pagehelper - 5.1.9 - - - - com.h2database - h2 - 1.4.196 - - - - - nuls-core-h2 - - - src/main/java - - **/*.xml - - true - - - src/test/java - - **/*.xml - - true - - - src/main/resources - - - - \ No newline at end of file diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/common/BaseMapper.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/common/BaseMapper.java deleted file mode 100644 index 5bab74e772..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/common/BaseMapper.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.common; - - -import io.nuls.core.h2.utils.Searchable; - -import java.util.List; - - -/** - * mybatis基础查询类，封装了对象的基本查询方法, - * 以下方法sql实现方式，都需自行写在mapper.xml里 - * @author zhouwei - * - */ -public interface BaseMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - int deleteByPrimaryKey(K key); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - int insert(V record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - int insertSelective(V record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - V selectByPrimaryKey(K key); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - int updateByPrimaryKeySelective(V record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - int updateByPrimaryKeyWithBLOBs(V record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table block - * - * @mbg.generated - */ - int updateByPrimaryKey(V record); - - int batchInsert(List list); - - Long countAll(); - - List selectList(Searchable searchable); - - long selectCount(Searchable searchable); - - -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/interceptor/TransactionInterceptor.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/interceptor/TransactionInterceptor.java deleted file mode 100644 index e3c0fe30a4..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/interceptor/TransactionInterceptor.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * MIT License - *

- * Copyright (c) 2017-2019 nuls.io - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - *

- * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.interceptor; - -import io.nuls.core.h2.transactional.annotation.Transaction; -import io.nuls.core.h2.utils.MybatisDbHelper; -import io.nuls.core.core.annotation.Interceptor; -import io.nuls.core.core.inteceptor.base.BeanMethodInterceptor; -import io.nuls.core.core.inteceptor.base.BeanMethodInterceptorChain; -import org.apache.ibatis.session.SqlSession; - -import java.lang.reflect.Method; - -/** - * @author zhouwei - * @date 2017/10/13 - */ -@Interceptor(Transaction.class) -public class TransactionInterceptor implements BeanMethodInterceptor { - - private static ThreadLocal FLAG_HOLDER = new ThreadLocal() { - @Override - protected Boolean initialValue() { - return false; - } - }; - - @Override - public Object intercept(Transaction annotation, Object object, Method method, Object[] params, BeanMethodInterceptorChain interceptorChain) throws Throwable { - boolean flag = FLAG_HOLDER.get(); - Object result; - - if (!flag) { - SqlSession sqlSession = null; - try { - FLAG_HOLDER.set(true); - sqlSession = MybatisDbHelper.getSession(); - result = interceptorChain.execute(annotation, object, method, params); - sqlSession.commit(); - } catch (Exception e) { - if (sqlSession != null) { - sqlSession.rollback(); - } - throw e; - } finally { - if (sqlSession != null) { - MybatisDbHelper.close(sqlSession); - } - FLAG_HOLDER.remove(); - } - } else { - result = interceptorChain.execute(annotation, object, method, params); - } - return result; - } -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/PROPAGATION.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/PROPAGATION.java deleted file mode 100644 index 95de4715a2..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/PROPAGATION.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.transactional.annotation; - -/** - * - * @author zhouwei - * @date 2017/10/26 - */ -public enum PROPAGATION { - NONE("none"), - REQUIRED("required"), - INDEPENDENT("independent"); - - - PROPAGATION(String value) { - this.value = value; - } - - private String value; -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/Transaction.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/Transaction.java deleted file mode 100644 index 5b58f4faa4..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/transactional/annotation/Transaction.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.transactional.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Created by zhouwei on 2017/10/26. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface Transaction { - PROPAGATION transactional() default PROPAGATION.REQUIRED; -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Condition.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Condition.java deleted file mode 100644 index ba1a18f9f8..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Condition.java +++ /dev/null @@ -1,184 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.utils; - -/** - * 封装sql查询条件赋值, - * prefix和endfix主要针对有时候查询条件需要在整条条件语句前后加上括号等情况时赋值调用 - * 如 (a.name is null or a.password is null) - * @author zhouwei - * - */ -public class Condition { - - public static final String AND = " and "; - - public static final String OR = " or "; - - /**查询字段*/ - private String key; - - /**查询值*/ - private Object value; - - /**查询逻辑运算符号 =, != , > , < 等*/ - private SearchOperator operator; - - /**查询链接符号,默认是and*/ - private String sqlSeparator = Condition.AND; - - /**查询条件前置符号*/ - private String prefix = ""; - - /**查询条件后置符号*/ - private String endfix = ""; - - public Condition() { - - } - - public Condition(String key, SearchOperator operator, Object value) { - if(value == null) { - value = ""; - } - this.key = key; - this.operator = operator; - this.value = valueFromOperator(operator, value); - } - - - public Condition(String sqlSeparator, String key, SearchOperator operator, Object value) { - if(value == null) { - value = ""; - } - this.sqlSeparator = sqlSeparator; - this.key = key; - this.operator = operator; - this.value = valueFromOperator(operator, value); - } - - public static Condition custom(String sql) { - Condition condition = new Condition(); - - condition.operator = SearchOperator.custom; - condition.value = sql; - return condition; - } - - /**根据运算逻辑符，校验value值*/ - public Object valueFromOperator(SearchOperator operator, Object value) { - if(value == null) { - value = ""; - } - if ("true".equals(value)) { - value = true; - } - if ("false".equals(value)) { - value = false; - } - - if (operator == SearchOperator.like || operator == SearchOperator.notLike) { - return "%" + value + "%"; - } - if (operator == SearchOperator.prefixLike || operator == SearchOperator.prefixNotLike) { - return value + "%"; - } - if (operator == SearchOperator.suffixLike || operator == SearchOperator.suffixNotLike) { - return "%" + value; - } - if (operator == SearchOperator.in || operator == SearchOperator.notIn) { - if (value instanceof String) { - return "(" + value + ")"; - } - } - return value; - } - - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - if(value == null) { - value = ""; - } - this.value = value; - } - - public SearchOperator getOperator() { - return operator; - } - - public void setOperator(SearchOperator operator) { - this.operator = operator; - } - - public String getSqlSeparator() { - return sqlSeparator; - } - - public void setSqlSeparator(String sqlSeparator) { - this.sqlSeparator = sqlSeparator; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public String getEndfix() { - return endfix; - } - - public void setEndfix(String endfix) { - this.endfix = endfix; - } - - //获取查询条件 - public String getString() { - if(this.operator == null) { - this.operator = SearchOperator.eq; - } - - String keyStr = this.sqlSeparator + " " + this.prefix + this.key; - if("in".equals(this.operator.getSymbol()) || "not in".equals(this.operator.getSymbol())) { - return keyStr + " " + this.operator.getSymbol() + " (" + this.value + ")" + endfix; - }else { - return keyStr + " " + this.operator.getSymbol() + " " + this.value + endfix; - } - } - -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/DruidDataSourceBuilder.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/DruidDataSourceBuilder.java deleted file mode 100644 index 308934b347..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/DruidDataSourceBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.nuls.core.h2.utils; - -import com.alibaba.druid.pool.DruidDataSource; -import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory; - -public class DruidDataSourceBuilder extends UnpooledDataSourceFactory { - public DruidDataSourceBuilder() { - this.dataSource = new DruidDataSource(); - } -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/MybatisDbHelper.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/MybatisDbHelper.java deleted file mode 100644 index d971683617..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/MybatisDbHelper.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.nuls.core.h2.utils; - -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; - -public class MybatisDbHelper { - - private static SqlSessionFactory sqlSessionFactory; - - private static ThreadLocal sessionHolder = new ThreadLocal<>(); - - - public static void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) { - MybatisDbHelper.sqlSessionFactory = sqlSessionFactory; - } - - public static SqlSession getSession() { - SqlSession sqlSession = sessionHolder.get(); - if (sqlSession == null) { - sqlSession = sqlSessionFactory.openSession(false); - sessionHolder.set(sqlSession); - } - return sqlSession; - } - - public void commit() { - SqlSession sqlSession = sessionHolder.get(); - sqlSession.commit(); - } - - public static void close(SqlSession sqlSession) { - if (sqlSession == sessionHolder.get()) { - sqlSession.close(); - sessionHolder.remove(); - } - } -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/SearchOperator.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/SearchOperator.java deleted file mode 100644 index 8949c06d67..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/SearchOperator.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.utils; - -/** - * 查询操作符 - * - * @author zhouwei - * - */ -public enum SearchOperator { - eq("等于", "="), - ne("不等于", "!="), - gt("大于", ">"), - gte("大于等于", ">="), - lt("小于","<"), - lte("小于等于", "<="), - like("模糊匹配", "like"), - notLike("不匹配","not like"), - prefixLike("前缀模糊匹配", "like"), - prefixNotLike("前缀模糊不匹配", "not like"), - suffixLike("后缀模糊匹配", "like"), - suffixNotLike("后缀模糊不匹配", "not like"), - isNull("空", "is null"), - isNotNull("非空", "is not null"), - in("包含", "in"), - notIn("不包含", "not in"), - custom("自定义默认的", null); - - private final String info; - private final String symbol; - - SearchOperator(final String info, String symbol) { - this.info = info; - this.symbol = symbol; - } - - public String getInfo() { - return info; - } - - public String getSymbol() { - return symbol; - } -} diff --git a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Searchable.java b/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Searchable.java deleted file mode 100644 index 4dd6e7e79a..0000000000 --- a/common/nuls-core-h2/src/main/java/io/nuls/core/h2/utils/Searchable.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.utils; - -import java.util.ArrayList; -import java.util.List; - -/** - * dao查询接口，封装查询语句工具类 - * @author zoro - * - */ -public class Searchable { - - /** - * 查询连接符，如：= != like - */ - private List operators; - - public Searchable() { - operators = new ArrayList(); - } - - public Searchable(List operators) { - this.operators = operators; - } - - /** - * 添加查询条件 - * @param c - */ - public void addCondition(Condition c) { - this.operators.add(c); - } - - - public void addCondition(String key , SearchOperator operator, Object value) { - this.addCondition(new Condition(key,operator,value)); - } - - /** - * 根据key删除某个条件 - * @param key - */ - public void removeCondition(String key) { - Condition c = null; - for(int i=0; i(); - } - - public List getOperators() { - return operators; - } - - public void setOperators(List operators) { - this.operators = operators; - } -} diff --git a/common/nuls-core-h2/src/main/resources/mybatis/mybatis-config.xml b/common/nuls-core-h2/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index 9836162ec7..0000000000 --- a/common/nuls-core-h2/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/CreateTable.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/CreateTable.java deleted file mode 100644 index 01431c084b..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/CreateTable.java +++ /dev/null @@ -1,103 +0,0 @@ -package io.nuls.h2; - - -import java.io.*; - -/** - * @author: Charlie - * @date: 2018/11/16 - */ -public class CreateTable { - - private static String path = "." + File.separator + "sql" + File.separator; - - private static String filenameTemp = null; - - public static void main(String[] args) { - - - - } - public static boolean createFile(String fileName,String filecontent){ - Boolean bool = false; - filenameTemp = path + fileName+".sql";//文件路径+名称+文件类型 - File file = new File(filenameTemp); - try { - //如果文件不存在，则创建新的文件 - if(!file.exists()){ - file.createNewFile(); - bool = true; - System.out.println("success create file,the file is "+filenameTemp); - //创建文件成功后，写入内容到文件里 - writeFileContent(filenameTemp, filecontent); - } - } catch (Exception e) { - e.printStackTrace(); - } - - return bool; - } - - /** - * 向文件中写入内容 - * @param filepath 文件路径与名称 - * @param newstr 写入的内容 - * @return - * @throws IOException - */ - public static boolean writeFileContent(String filepath,String newstr) throws IOException{ - Boolean bool = false; - String filein = newstr+"\r\n";//新写入的行，换行 - String temp = ""; - - FileInputStream fis = null; - InputStreamReader isr = null; - BufferedReader br = null; - FileOutputStream fos = null; - PrintWriter pw = null; - try { - File file = new File(filepath);//文件路径(包括文件名称) - //将文件读入输入流 - fis = new FileInputStream(file); - isr = new InputStreamReader(fis); - br = new BufferedReader(isr); - StringBuffer buffer = new StringBuffer(); - - //文件原有内容 - for(int i=0;(temp =br.readLine())!=null;i++){ - buffer.append(temp); - // 行与行之间的分隔符 相当于“\n” - buffer = buffer.append(System.getProperty("line.separator")); - } - buffer.append(filein); - - fos = new FileOutputStream(file); - pw = new PrintWriter(fos); - pw.write(buffer.toString().toCharArray()); - pw.flush(); - bool = true; - } catch (Exception e) { - // TODO: handle exception - e.printStackTrace(); - }finally { - //不要忘记关闭 - if (pw != null) { - pw.close(); - } - if (fos != null) { - fos.close(); - } - if (br != null) { - br.close(); - } - if (isr != null) { - isr.close(); - } - if (fis != null) { - fis.close(); - } - } - return bool; - } - -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/H2Test.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/H2Test.java deleted file mode 100644 index f66613a527..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/H2Test.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.nuls.core.h2; - -import io.nuls.core.h2.dao.impl.BaseService; -import io.nuls.core.h2.dao.impl.TransactionServiceImpl; -import io.nuls.h2.dao.TransactionService; -import org.apache.ibatis.io.Resources; -import org.apache.ibatis.session.SqlSessionFactoryBuilder; -import org.junit.Before; -import org.junit.Test; - -import java.io.InputStream; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -/** - * @author: Charlie - * @date: 2018/11/14 - */ -public class H2Test { - - @Before - public void before() throws Exception{ - String resource = "mybatis/mybatis-config.xml"; - InputStream in = Resources.getResourceAsStream(resource); - BaseService.sqlSessionFactory = new SqlSessionFactoryBuilder().build(in); - //SessionManager.setSqlSessionFactory(sqlSessionFactory); - } - - @Test - public void init(){ - TransactionService ts = new TransactionServiceImpl(); - /* TransactionPo txPo = new TransactionPo(); - txPo.setAddress("address_ertyuighjk"); - txPo.setHash("hash_zxcvbnmasdfghjk"); - txPo.setAmount(800000L); - txPo.setState(0); - txPo.setType(1); - txPo.setTime(new Date().getTime()); - ts.saveTx(txPo);*/ - //ts.createTable("transaction", "transaction_index",128); - ts.createTxTables("transaction", "transaction_index",128); - } - - @Test - public void db(){ - String JDBC_URL = "jdbc:h2:file:./entity/nuls;INIT=RUNSCRIPT FROM 'classpath:sql/schema-h2-bak.sql';LOG=2;DB_CLOSE_DELAY=-1;TRACE_LEVEL_SYSTEM_OUT=1;DATABASE_TO_UPPER=FALSE"; - //连接数据库时使用的用户名 - String USER = "sa"; - //连接数据库时使用的密码 - String PASSWORD = "26"; - String DRIVER_CLASS = "org.h2.Driver"; - try { - Class.forName(DRIVER_CLASS); - Connection conn = DriverManager.getConnection(JDBC_URL, USER, PASSWORD); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - - - } -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/BaseDataService.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/BaseDataService.java deleted file mode 100644 index cb8c57508e..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/BaseDataService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.h2.dao; - -import java.util.List; -import java.util.Map; - -/** - * @author zhouwei - * @date 2017/9/29 - */ -public interface BaseDataService { - - /** - * 单个数据存储 - * - * @param t 持久化数据 - * @return - */ - int save(T t); - - /** - * 批量存储 - * - * @param list 持久化数据集合 - * @return - */ - int save(List list); - - /** - * 修改数据 - * - * @param t 修改后持久化数据 - * @return - */ - int update(T t); - - int update(List list); - - /** - * 通过键值获取数据 - * - * @param k 数据的键值 - * @return - */ - T get(K k); - - /** - * 删除持久化数据 - * - * @param k 数据的键值 - * @return - */ - int delete(K k); - - /** - * @return all - */ - List getList(); - - /** - * @param params - * @return - */ - List getList(Map params); - - /** - * @return - */ - Long getCount(); - - List getPageList(Map params, int pageSize, int pageNumber, String orderBy); - -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/TransactionService.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/TransactionService.java deleted file mode 100644 index a06922a73f..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/TransactionService.java +++ /dev/null @@ -1,35 +0,0 @@ -package io.nuls.h2.dao; - -import com.github.pagehelper.Page; -import io.nuls.h2.entity.TransactionPO; - -import java.util.List; - -/** - * @author: Charlie - * @date: 2018/11/14 - */ -public interface TransactionService { - - Page getTxs(String address, Integer type, Integer state, - Long startTime, Long endTime, int pageNum, int pageSize, String orderBy); - - int saveTx(TransactionPO txPo); - - int saveTxs(List txPoList); - - int deleteTx(TransactionPO txPo); - - - /** - * - * - * 初始化创建存储交易的表 - * @param tableName table name - * @param indexName table index name - * @param number number of tables 分表的数量 - */ - void createTable(String tableName, String indexName, int number); - - void createTxTables(String tableName, String indexName, int number); -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/BaseService.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/BaseService.java deleted file mode 100644 index ea32a4ee60..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/BaseService.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * MIT License - ** - * Copyright (c) 2017-2019 nuls.io - ** - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - ** - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - ** - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.core.h2.dao.impl; - -import io.nuls.core.h2.common.BaseMapper; -import org.apache.ibatis.session.SqlSessionFactory; - -/** - * @author: Charlie - * @date: 2018/11/14 - */ -public abstract class BaseService { - - public static SqlSessionFactory sqlSessionFactory; - - /* private Class mapperClass; - - public BaseService(Class mapperClass) { - this.mapperClass = mapperClass; - } - - private SqlSession getSession() { - return sqlSessionFactory.openSession(true); - } - - protected T getMapper() { - SqlSession session = getSession(); - return session.getMapper(mapperClass); - } - */ -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/TransactionServiceImpl.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/TransactionServiceImpl.java deleted file mode 100644 index 85ec81ba33..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/TransactionServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package io.nuls.core.h2.dao.impl; - -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import io.nuls.core.h2.dao.impl.mapper.TransactionMapper; -import io.nuls.core.h2.utils.SearchOperator; -import io.nuls.core.h2.utils.Searchable; -import io.nuls.h2.dao.TransactionService; -import io.nuls.h2.entity.TransactionPO; -import io.nuls.h2.entity.TxTable; -import io.nuls.core.core.annotation.Service; -import org.apache.ibatis.session.SqlSession; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author: Charlie - * @date: 2018/11/14 - */ -@Service -public class TransactionServiceImpl extends io.nuls.core.h2.dao.impl.BaseService implements TransactionService { - - @Override - public Page getTxs(String address, Integer type, Integer state, Long startTime, Long endTime, int pageNumber, int pageSize, String orderBy) { - //数据库交易查询结果集 - List transactionList = new ArrayList<>(); - Searchable searchable = new Searchable(); - if (null != type) { - searchable.addCondition("type", SearchOperator.eq, type); - } - if (null != state) { - searchable.addCondition("state", SearchOperator.eq, state); - } - - //开启分页 - PageHelper.startPage(pageNumber, pageSize); - - - return null; - } - - @Override - public int saveTx(TransactionPO txPo) { - SqlSession sqlSession = sqlSessionFactory.openSession(); - int rs = sqlSession.getMapper(TransactionMapper.class).save(txPo); - sqlSession.commit(); - sqlSession.close(); - return rs; - } - - @Override - public int saveTxs(List txPoList) { - return 0; - } - - @Override - public int deleteTx(TransactionPO txPo) { - return 0; - } - - - @Override - public void createTable(String tableName, String indexName, int number) { - SqlSession sqlSession = sqlSessionFactory.openSession(); - TransactionMapper mapper = sqlSession.getMapper(TransactionMapper.class); - for (int i = 0; i <= number; i++) { - mapper.createTable(tableName + "_" + i, indexName + "_" + i); - } - sqlSession.commit(); - sqlSession.close(); - System.out.println("OK"); - } - - - @Override - public void createTxTables(String tableName, String indexName, int number) { - SqlSession sqlSession = sqlSessionFactory.openSession(); - TransactionMapper mapper = sqlSession.getMapper(TransactionMapper.class); - List list = new ArrayList<>(); - for (int i = 0; i <= number; i++) { - TxTable txTable = new TxTable(tableName + "_" + i, indexName + "_" + i); - list.add(txTable); - } - mapper.createTxTables(list); - sqlSession.commit(); - sqlSession.close(); - System.out.println("batch OK"); - } -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.java deleted file mode 100644 index a113a26fdf..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.h2.dao.impl.mapper; - -import java.io.Serializable; - -/** - * mybatis查询组件使用，见sqlmap/commonMapper.xml - * @author hanchaoyong - */ -public interface CommonMapper { - -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.xml b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.xml deleted file mode 100644 index 17201af325..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/CommonMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - ${item.sqlSeparator}${item.prefix} - - - ${item.value} - - - ${item.key} ${item.operator.symbol} - - - ${item.key} ${item.operator.symbol} - #{inItem} - - - ${item.key} ${item.operator.symbol} #{item.value} - - - ${item.endfix} - - - - - \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.java deleted file mode 100644 index e1bf31c109..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.nuls.core.h2.dao.impl.mapper; - -import io.nuls.core.h2.common.BaseMapper; -import io.nuls.h2.entity.TransactionPO; -import io.nuls.h2.entity.TxTable; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author: Charlie - * @date: 2018/11/14 - */ -public interface TransactionMapper extends BaseMapper { - - void createTable(@Param("tableName") String tableName, @Param("indexName") String indexName); - - void createTxTables(@Param("list") List list); - - int save(TransactionPO transactionPo); -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.xml b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.xml deleted file mode 100644 index 6e13b7cce6..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/dao/impl/mapper/TransactionMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CREATE TABLE ${tableName} ( - ADDRESS VARCHAR(40) not null - primary key, - HASH VARCHAR(70) not null, - TYPE TINYINT not null, - AMOUNT BIGINT not null, - STATE TINYINT not null, - TIME BIGINT not null - ); - create index IF NOT EXISTS ${indexName} - on ${tableName} (ADDRESS); - - - - - CREATE TABLE IF NOT EXISTS ${tx.tableName} ( - ADDRESS VARCHAR(40) not null - primary key, - HASH VARCHAR(70) not null, - TYPE TINYINT not null, - AMOUNT BIGINT not null, - STATE TINYINT not null, - TIME BIGINT not null - ); - create index IF NOT EXISTS ${tx.indexName} - on ${tx.tableName} (ADDRESS); - - - - - insert into TRANSACTION_888 (address, hash, `type`, amount, state, `time`) - values - (#{address}, #{hash}, #{type}, #{amount}, #{state}, #{time}) - - \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TransactionPO.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TransactionPO.java deleted file mode 100644 index f5626eee31..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TransactionPO.java +++ /dev/null @@ -1,83 +0,0 @@ -package io.nuls.h2.entity; - -/** - * @author: Charlie - * @date: 2018/11/14 - */ -public class TransactionPO { - - private String address; - - private String hash; - - private Integer type; - - private Long amount; - - /** - * 0:转出, 1:转入, 2:冻结 - */ - private Integer state; - - private Long time; - - - - /** - * 以账户地址来分表储存 - * 交易地址的hashCode 与 100 取模 - * 得到本条数据存在哪张表里面 - * @return - */ - public int getTableIndex(){ - return this.address.hashCode() % 100; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getHash() { - return hash; - } - - public void setHash(String hash) { - this.hash = hash; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getState() { - return state; - } - - public void setState(Integer state) { - this.state = state; - } - - public Long getTime() { - return time; - } - - public void setTime(Long time) { - this.time = time; - } - - public Long getAmount() { - return amount; - } - - public void setAmount(Long amount) { - this.amount = amount; - } -} diff --git a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TxTable.java b/common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TxTable.java deleted file mode 100644 index c97475183d..0000000000 --- a/common/nuls-core-h2/src/test/java/io/nuls/core/h2/entity/TxTable.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.nuls.h2.entity; - -/** - * @author: Charlie - * @date: 2018/11/18 - */ -public class TxTable { - private String tableName; - - private String indexName; - - public TxTable(){ - - } - - public TxTable(String tableName, String indexName) { - this.tableName = tableName; - this.indexName = indexName; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getIndexName() { - return indexName; - } - - public void setIndexName(String indexName) { - this.indexName = indexName; - } -} diff --git a/common/nuls-core-h2/src/test/resources/db_config.properties b/common/nuls-core-h2/src/test/resources/db_config.properties deleted file mode 100644 index 276ce22468..0000000000 --- a/common/nuls-core-h2/src/test/resources/db_config.properties +++ /dev/null @@ -1,20 +0,0 @@ - -#h2 database -druid.driverClassName=org.h2.Driver -druid.url=jdbc:h2:file:./data/nuls;INIT=RUNSCRIPT FROM 'classpath:sql/schema-h2.sql';LOG=2;DB_CLOSE_DELAY=-1;TRACE_LEVEL_SYSTEM_OUT=1;DATABASE_TO_UPPER=FALSE -druid.username=sa -druid.password=26 - -druid.initialSize=10 -druid.minIdle=10 -druid.maxActive=50 -druid.maxWait=10000 -druid.timeBetweenEvictionRunsMillis=60000 -druid.minEvictableIdleTimeMillis=300000 -druid.poolPreparedStatements=true -druid.maxPoolPreparedStatementPerConnectionSize=20 -druid.defaultAutoCommit=true -druid.validationQuery=select 1 - -#mybatis.mapper -mybatis.mapper=io.nuls.h2.dao.impl.mapper \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/resources/mybatis/mapping/CommonMapper.xml b/common/nuls-core-h2/src/test/resources/mybatis/mapping/CommonMapper.xml deleted file mode 100644 index cfd736ca18..0000000000 --- a/common/nuls-core-h2/src/test/resources/mybatis/mapping/CommonMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - ${item.sqlSeparator}${item.prefix} - - - ${item.value} - - - ${item.key} ${item.operator.symbol} - - - ${item.key} ${item.operator.symbol} - #{inItem} - - - ${item.key} ${item.operator.symbol} #{item.value} - - - ${item.endfix} - - - - - \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/resources/mybatis/mybatis-config-bak.xml b/common/nuls-core-h2/src/test/resources/mybatis/mybatis-config-bak.xml deleted file mode 100644 index 825724751e..0000000000 --- a/common/nuls-core-h2/src/test/resources/mybatis/mybatis-config-bak.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/resources/sql/schema-h2-bak.sql b/common/nuls-core-h2/src/test/resources/sql/schema-h2-bak.sql deleted file mode 100644 index f387a29993..0000000000 --- a/common/nuls-core-h2/src/test/resources/sql/schema-h2-bak.sql +++ /dev/null @@ -1,174 +0,0 @@ - -CREATE TABLE IF NOT EXISTS `account` ( - `address` varchar(40) NOT NULL, - `create_time` bigint(14) NOT NULL, - `alias` varchar(100) DEFAULT NULL, - `pub_key` varbinary(100) DEFAULT NULL, - `pri_key` varbinary(100) DEFAULT NULL, - `encrypted_pri_key` varbinary(100) DEFAULT NULL, - `extend` varbinary(1024) DEFAULT NULL, - `status` INT DEFAULT 0, - PRIMARY KEY (`address`) -) ; - -CREATE TABLE IF NOT EXISTS `punish_log` ( - `id` varchar(32) NOT NULL, - `address` varchar(40) NOT NULL, - `type` int(1) NOT NULL, - `height` bigint(14) NOT NULL, - `round_index` bigint(14) NOT NULL, - `time` bigint(14) NOT NULL, - PRIMARY KEY (`id`) -) ; - -CREATE TABLE IF NOT EXISTS `block_header` ( - `hash` varchar(70) NOT NULL, - `height` bigint(14) NOT NULL, - `pre_hash` varchar(70) DEFAULT NULL, - `merkle_hash` varchar(70) NOT NULL, - `create_time` bigint(14) NOT NULL, - `consensus_address` varchar(40) DEFAULT NULL, - `tx_count` int(5) NOT NULL, - `round_index` bigint(14) NOT NULL, - `scriptSig` varbinary(1024) DEFAULT NULL, - `extend` varbinary(1024) NOT NULL, - `size` int(9) DEFAULT NULL, - PRIMARY KEY (`hash`), - UNIQUE KEY `block_height_idx` (`height`) -) ; - -CREATE TABLE IF NOT EXISTS `agent` ( - `id` varchar(70) NOT NULL, - `agent_address` varchar(40) NOT NULL, - `agent_name` varchar(50) NOT NULL, - `block_height` bigint(18) NOT NULL, - `packing_address` varchar(40) NOT NULL, - `deposit` bigint(18) NOT NULL, - `remark` varchar(255) NOT NULL, - `del_height` bigint(18) DEFAULT 0, - `status` INT DEFAULT 0, - `tx_hash` varchar(70) NOT NULL, - `start_time` bigint(14) NOT NULL, - `commission_rate` decimal(14,2) NOT NULL, - PRIMARY KEY (`id`) -) ; - -CREATE TABLE IF NOT EXISTS `deposit` ( - `id` varchar(70) NOT NULL, - `address` varchar(40) NOT NULL, - `agent_id` varchar(70) NOT NULL, - `deposit` bigint(18) NOT NULL, - `status` int(1) DEFAULT NULL, - `del_height` bigint(18) DEFAULT 0, - `time` bigint(14) DEFAULT NULL, - `block_height` bigint(14) DEFAULT NULL, - `tx_hash` varchar(70) NOT NULL, - PRIMARY KEY (`id`) -) ; - -CREATE TABLE IF NOT EXISTS `node` ( - `id` VARCHAR(30) NOT NULL, - `ip` varchar(20) NOT NULL, - `port` int(6) NOT NULL, - `last_time` bigint(20) NOT NULL, - `last_fail_time` bigint(20) NOT NULL, - `fail_count` int(1) NOT NULL, - `status` int(1) NOT NULL, - `magic_num` int(11) NOT NULL, - PRIMARY KEY (`id`) -) ; - -CREATE TABLE IF NOT EXISTS `node_group` ( - `name` varchar(30) NOT NULL, - PRIMARY KEY (`name`) -) ; - -CREATE TABLE IF NOT EXISTS `node_group_relation` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `node_id` varchar(30) NOT NULL, - `group_id` varchar(30) NOT NULL, - PRIMARY KEY (`id`) -) ; - -CREATE TABLE IF NOT EXISTS `sub_chain` ( - `id` varchar(30) NOT NULL, - `creator_address` varchar(40) NOT NULL, - `tx_hash` varchar(70) NOT NULL, - `g_block` varbinary(1024) NOT NULL, - `g_block_hash` varchar(70) NOT NULL, - `g_merkle_hash` varchar(70) NOT NULL, - `g_block_header` varbinary(1024) NOT NULL, - `title` varchar(255) NOT NULL, - `sign` varbinary(1024) NOT NULL, - `address_prefix` int(5) NOT NULL, - PRIMARY KEY (`id`) -) ; - -CREATE TABLE IF NOT EXISTS `transaction` ( - `hash` varchar(70) NOT NULL, - `tx_index` int(5) NOT NULL, - `type` int(5) NOT NULL, - `create_time` bigint(15) NOT NULL, - `block_height` bigint(15) NOT NULL, - `remark` varchar(100) DEFAULT NULL, - `fee` bigint(19) NOT NULL, - `txData` varbinary(307200) DEFAULT NULL, - `scriptSig` varbinary(255) DEFAULT NULL, - `size` int(9) DEFAULT NULL, - PRIMARY KEY (`hash`) -) ; - -CREATE TABLE IF NOT EXISTS `transaction_local` ( - `hash` varchar(70) NOT NULL, - `tx_index` int(5) NOT NULL, - `type` int(5) NOT NULL, - `create_time` bigint(15) NOT NULL, - `block_height` bigint(15) NOT NULL, - `remark` varchar(100) DEFAULT NULL, - `fee` bigint(19) NOT NULL, - `transferType` int(1) DEFAULT NULL, - `txData` BLOB DEFAULT NULL, - `coinData` BLOB DEFAULT NULL, - `scriptSig` varbinary(255) DEFAULT NULL, - `size` int(9) DEFAULT NULL, - `txStatus` tinyint(1) DEFAULT NULL, - PRIMARY KEY (`hash`) -) ; - -CREATE TABLE IF NOT EXISTS `tx_account_relation` ( - `tx_hash` varchar(70) NOT NULL, - `address` varchar(40) NOT NULL, - PRIMARY KEY (`tx_hash`, `address`) -) ; - -CREATE TABLE IF NOT EXISTS `utxo_input` ( - `tx_hash` varchar(70) NOT NULL, - `in_index` int(5) NOT NULL, - `from_hash` varchar(70) NOT NULL, - `from_index` int(5) NOT NULL, - PRIMARY KEY (`tx_hash`,`in_index`), - UNIQUE KEY `from_idx` (`from_hash`,`from_index`) -) ; - -CREATE TABLE IF NOT EXISTS `utxo_output` ( - `tx_hash` varchar(70) NOT NULL, - `out_index` int(5) NOT NULL, - `value` bigint(18) NOT NULL, - `lock_time` bigint(20) DEFAULT NULL, - `status` tinyint(1) NOT NULL, - `script` varbinary(1024) NOT NULL, - `address` varchar(40) NOT NULL, - PRIMARY KEY (`tx_hash`,`out_index`) -) ; - -CREATE TABLE IF NOT EXISTS `alias` ( - `alias` varchar(40) NOT NULL, - `address` varchar(40) NOT NULL, - `status` tinyint(1) DEFAULT NULL, - PRIMARY KEY (`alias`), - UNIQUE KEY `alias_address_idx` (`address`) -) ; - -create index IF NOT EXISTS block_height_idx on transaction(block_height); -create index IF NOT EXISTS status_idx on transaction_local(txStatus); -create index IF NOT EXISTS addres_idx on utxo_output(address); \ No newline at end of file diff --git a/common/nuls-core-h2/src/test/resources/sql/schema-h2.sql b/common/nuls-core-h2/src/test/resources/sql/schema-h2.sql deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/pom.xml b/common/pom.xml index 63dd37d0f6..6e258657ce 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -14,7 +14,6 @@ nuls-core - nuls-core-h2 nuls-core-rpc nuls-core-rockdb nuls-base diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java index 4f2e1b6604..8cf627fe23 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java @@ -4,11 +4,11 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsRuntimeException; +import io.nuls.core.model.StringUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; import io.nuls.provider.model.dto.ContractTokenInfoDto; import io.nuls.provider.rpctools.vo.AccountBalance; -import org.checkerframework.checker.units.qual.A; import java.math.BigInteger; import java.util.ArrayList; @@ -85,7 +85,7 @@ public Result> getBalanceList(int chainId, List coinDt int assetChainId = (int) map.get("chainId"); int assetId = (int) map.get("assetId"); String contractAddress = (String) map.get("contractAddress"); - if (assetId > 0) { + if (StringUtils.isBlank(contractAddress)) { AccountBalance accountBalance = getBalanceAndNonce(chainId, assetChainId, assetId, address).getData(); accountBalance.setAssetChainId(assetChainId); accountBalance.setAssetId(assetId); diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java b/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java index ef177e621a..ae7bbb5fbd 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java +++ b/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java @@ -28,32 +28,708 @@ public class TxSendTester { @Test public void test() throws Exception { - NoUse.mockModule(); +// NoUse.mockModule(); String prikey = ""; ECKey ecKey = ECKey.fromPrivate(HexUtil.decode(prikey)); - byte[] address = AddressTool.getAddress(ecKey.getPubKey(), 2); + byte[] address = AddressTool.getAddress(ecKey.getPubKey(), 1); ResetChainInfoTransaction tx = new ResetChainInfoTransaction(); tx.setTime(System.currentTimeMillis() / 1000); ResetChainInfoData txData = new ResetChainInfoData(); - txData.setJson("{\"chainId\":2,\"chainName\":\"nuls2\",\"minAvailableNodeNum\":0,\"maxSignatureCount\":0,\"signatureByzantineRatio\":0,\"addressPrefix\":\"tNULS\",\"assetInfoList\":[{\"assetId\":1,\"symbol\":\"NULS\",\"assetName\":\"\",\"usable\":true,\"decimalPlaces\":8},{\"assetId\":8,\"symbol\":\"T1\",\"assetName\":\"t1\",\"usable\":true,\"decimalPlaces\":9}],\"verifierList\":[],\"registerTime\":0}"); + txData.setJson("{\n" + + " \"chainId\":1,\n" + + " \"chainName\":\"nuls\",\n" + + " \"minAvailableNodeNum\":0,\n" + + " \"maxSignatureCount\":100,\n" + + " \"signatureByzantineRatio\":66,\n" + + " \"addressPrefix\":\"NULS\",\n" + + " \"assetInfoList\":[\n" + + " {\n" + + " \"assetId\":1,\n" + + " \"symbol\":\"NULS\",\n" + + " \"assetName\":\"\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":18,\n" + + " \"symbol\":\"LCC\",\n" + + " \"assetName\":\"LCC\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":6\n" + + " },\n" + + " {\n" + + " \"assetId\":4,\n" + + " \"symbol\":\"OBEE\",\n" + + " \"assetName\":\"ObeeNetwork\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":5,\n" + + " \"symbol\":\"Galan\",\n" + + " \"assetName\":\"GAN\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":25,\n" + + " \"symbol\":\"TPU\",\n" + + " \"assetName\":\"TPUSaas\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":33,\n" + + " \"symbol\":\"Goblin\",\n" + + " \"assetName\":\"Goblin\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":45,\n" + + " \"symbol\":\"DATT\",\n" + + " \"assetName\":\"DATT\",\n" + + " \"usable\":false,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":13,\n" + + " \"symbol\":\"DATT\",\n" + + " \"assetName\":\"DATT\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":55,\n" + + " \"symbol\":\"BCNT\",\n" + + " \"assetName\":\"BCNToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":19,\n" + + " \"symbol\":\"PETC\",\n" + + " \"assetName\":\"PetCoin\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":17,\n" + + " \"symbol\":\"LCC\",\n" + + " \"assetName\":\"LCC\",\n" + + " \"usable\":false,\n" + + " \"decimalPlaces\":6\n" + + " },\n" + + " {\n" + + " \"assetId\":77,\n" + + " \"symbol\":\"CROS\",\n" + + " \"assetName\":\"cros_test\",\n" + + " \"usable\":false,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":57,\n" + + " \"symbol\":\"Goblin\",\n" + + " \"assetName\":\"Goblin\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":21,\n" + + " \"symbol\":\"EHT\",\n" + + " \"assetName\":\"Earhart\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":87,\n" + + " \"symbol\":\"TRG\",\n" + + " \"assetName\":\"TokenRepublic\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":81,\n" + + " \"symbol\":\"VIBK\",\n" + + " \"assetName\":\"Vibook\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":98,\n" + + " \"symbol\":\"BNF\",\n" + + " \"assetName\":\"BonFi\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":114,\n" + + " \"symbol\":\"KTLYO\",\n" + + " \"assetName\":\"KatalyoToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":124,\n" + + " \"symbol\":\"SNEGY\",\n" + + " \"assetName\":\"Sonergy\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":133,\n" + + " \"symbol\":\"FMP\",\n" + + " \"assetName\":\"BitsFlea_Point\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":4\n" + + " },\n" + + " {\n" + + " \"assetId\":128,\n" + + " \"symbol\":\"CBT\",\n" + + " \"assetName\":\"CBToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":90,\n" + + " \"symbol\":\"ARCH\",\n" + + " \"assetName\":\"ARCHCOIN\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":10\n" + + " },\n" + + " {\n" + + " \"assetId\":103,\n" + + " \"symbol\":\"MCP\",\n" + + " \"assetName\":\"MyCryptoPlay\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":96,\n" + + " \"symbol\":\"CBLT\",\n" + + " \"assetName\":\"Cobalt\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":91,\n" + + " \"symbol\":\"JTT\",\n" + + " \"assetName\":\"JustTest\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":112,\n" + + " \"symbol\":\"RYIP\",\n" + + " \"assetName\":\"RYIPLATINUM\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":117,\n" + + " \"symbol\":\"MES\",\n" + + " \"assetName\":\"MesChain\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":113,\n" + + " \"symbol\":\"NIA\",\n" + + " \"assetName\":\"Nydronia\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":107,\n" + + " \"symbol\":\"EGR\",\n" + + " \"assetName\":\"EgorasToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":116,\n" + + " \"symbol\":\"GHD\",\n" + + " \"assetName\":\"Giftedhands\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":131,\n" + + " \"symbol\":\"ZERO\",\n" + + " \"assetName\":\"ZERO_Token\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":130,\n" + + " \"symbol\":\"FAR\",\n" + + " \"assetName\":\"FarSwap\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":99,\n" + + " \"symbol\":\"RVX\",\n" + + " \"assetName\":\"RiveX\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":136,\n" + + " \"symbol\":\"GGTK\",\n" + + " \"assetName\":\"GGToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":146,\n" + + " \"symbol\":\"NABOX\",\n" + + " \"assetName\":\"Nabox_Token\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":132,\n" + + " \"symbol\":\"SHD\",\n" + + " \"assetName\":\"SHIELD\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":143,\n" + + " \"symbol\":\"XNINJA\",\n" + + " \"assetName\":\"XNinjaSwap\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":119,\n" + + " \"symbol\":\"PEET\",\n" + + " \"assetName\":\"Peet\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":149,\n" + + " \"symbol\":\"TICO\",\n" + + " \"assetName\":\"TICOEXToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":148,\n" + + " \"symbol\":\"JDI\",\n" + + " \"assetName\":\"JDIToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":147,\n" + + " \"symbol\":\"KFI\",\n" + + " \"assetName\":\"KeFiToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":152,\n" + + " \"symbol\":\"ARTDECO\",\n" + + " \"assetName\":\"ARTDECO\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":150,\n" + + " \"symbol\":\"TROP\",\n" + + " \"assetName\":\"Interop\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":151,\n" + + " \"symbol\":\"NFD\",\n" + + " \"assetName\":\"NonFungibleDefi\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":157,\n" + + " \"symbol\":\"SMG\",\n" + + " \"assetName\":\"SmaugsNFT\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":158,\n" + + " \"symbol\":\"ICH\",\n" + + " \"assetName\":\"Ideachaincoin\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":159,\n" + + " \"symbol\":\"KSF\",\n" + + " \"assetName\":\"KesefFinance\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":139,\n" + + " \"symbol\":\"Vox\",\n" + + " \"assetName\":\"Vox\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":162,\n" + + " \"symbol\":\"TOM\",\n" + + " \"assetName\":\"TOM\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":156,\n" + + " \"symbol\":\"PTE\",\n" + + " \"assetName\":\"Peet\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":160,\n" + + " \"symbol\":\"APPN\",\n" + + " \"assetName\":\"APPN\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":163,\n" + + " \"symbol\":\"DEFIY\",\n" + + " \"assetName\":\"DeFiFarms\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":164,\n" + + " \"symbol\":\"LIVENFT\",\n" + + " \"assetName\":\"LiveNFTToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":170,\n" + + " \"symbol\":\"TXO\",\n" + + " \"assetName\":\"Texo\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":169,\n" + + " \"symbol\":\"8BIT\",\n" + + " \"assetName\":\"8bit\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":168,\n" + + " \"symbol\":\"FIRE\",\n" + + " \"assetName\":\"GreenFire\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":167,\n" + + " \"symbol\":\"VNT\",\n" + + " \"assetName\":\"VENTION\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":171,\n" + + " \"symbol\":\"GMX\",\n" + + " \"assetName\":\"GameX\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":172,\n" + + " \"symbol\":\"CCFI\",\n" + + " \"assetName\":\"CloudCoinFinance\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":176,\n" + + " \"symbol\":\"PRB\",\n" + + " \"assetName\":\"PremiumBlock\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":179,\n" + + " \"symbol\":\"NFTC\",\n" + + " \"assetName\":\"NFTCircle\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":2\n" + + " },\n" + + " {\n" + + " \"assetId\":174,\n" + + " \"symbol\":\"XYL\",\n" + + " \"assetName\":\"xyl\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":175,\n" + + " \"symbol\":\"BDAM\",\n" + + " \"assetName\":\"BDAMCoin\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":177,\n" + + " \"symbol\":\"DNF\",\n" + + " \"assetName\":\"DNFT\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":178,\n" + + " \"symbol\":\"WHX\",\n" + + " \"assetName\":\"WHITEX\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":183,\n" + + " \"symbol\":\"ZOZO\",\n" + + " \"assetName\":\"ZoZotoken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":181,\n" + + " \"symbol\":\"EMC2\",\n" + + " \"assetName\":\"EINSTEINTOKEN\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":9\n" + + " },\n" + + " {\n" + + " \"assetId\":180,\n" + + " \"symbol\":\"MVH\",\n" + + " \"assetName\":\"MovieCash\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":191,\n" + + " \"symbol\":\"GCC\",\n" + + " \"assetName\":\"GLOBALCOMMCOIN\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":194,\n" + + " \"symbol\":\"OLD\",\n" + + " \"assetName\":\"Oldtimer\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":198,\n" + + " \"symbol\":\"DGP\",\n" + + " \"assetName\":\"DGPAYMENT\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":225,\n" + + " \"symbol\":\"ZINA\",\n" + + " \"assetName\":\"Zinari\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":226,\n" + + " \"symbol\":\"FUSE\",\n" + + " \"assetName\":\"Niftyfuse\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":196,\n" + + " \"symbol\":\"AVN\",\n" + + " \"assetName\":\"AVNRichToken\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":234,\n" + + " \"symbol\":\"LAND\",\n" + + " \"assetName\":\"Landshare\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":237,\n" + + " \"symbol\":\"Alkom\",\n" + + " \"assetName\":\"Alkom\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":235,\n" + + " \"symbol\":\"TIC\",\n" + + " \"assetName\":\"TreasureIsland\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":187,\n" + + " \"symbol\":\"XTMC\",\n" + + " \"assetName\":\"XTMCSWAPAPP\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":18\n" + + " },\n" + + " {\n" + + " \"assetId\":242,\n" + + " \"symbol\":\"VOLT\",\n" + + " \"assetName\":\"Volterra\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":240,\n" + + " \"symbol\":\"UV\",\n" + + " \"assetName\":\"Unityventures\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":8\n" + + " },\n" + + " {\n" + + " \"assetId\":0,\n" + + " \"symbol\":\"OxSGD\",\n" + + " \"assetName\":\"OxSGD\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":4\n" + + " },\n" + + " {\n" + + " \"assetId\":276,\n" + + " \"symbol\":\"OxSGD\",\n" + + " \"assetName\":\"OxSGD\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":4\n" + + " },\n" + + " {\n" + + " \"assetId\":281,\n" + + " \"symbol\":\"OxUSD\",\n" + + " \"assetName\":\"OxUSD\",\n" + + " \"usable\":true,\n" + + " \"decimalPlaces\":4\n" + + " }\n" + + " ],\n" + + " \"verifierList\":[ \n" + + " \"NULSd6Hga4mQkHAnQdhUiMmv1V3kQ4a84JaSb\",\n" + + "\"NULSd6HgU65xXgWR2jrXEKwXivQj6WCBYVhoA\",\n" + + "\"NULSd6HgX1bNap7DxUftecymeB7VjdHz4HvKU\",\n" + + "\"NULSd6HgetcSk3cZz5ps92mQUzaptUxv6WRcT\",\n" + + "\"NULSd6HgY2LiyEDvMjsHqZpyajxSXEgk1mcxs\",\n" + + "\"NULSd6HgapEiSk1PMYBZtbWBRMcCyjm7Vgjri\",\n" + + "\"NULSd6HgirJR5i3SkwADF96QHP6uhLvBHE2yQ\",\n" + + "\"NULSd6Hghpud5oDJ6FPXNwLiiU8xryqE1sYmv\",\n" + + "\"NULSd6HgaSJ21zt1Qppb4rbuec2AkuaQLgnk8\",\n" + + "\"NULSd6Hgb7SV891gcu1FB2V6pRDvSUcfd75o6\",\n" + + "\"NULSd6HgbJmUep4wyreghHDk28AusSCrSuDMF\",\n" + + "\"NULSd6HgcR5ouh1aDU3oktEoJGQConj4sr1KR\",\n" + + "\"NULSd6HghM5wyVjegBaDsCkW9dvBnkuucejxw\",\n" + + "\"NULSd6HgapV9vQS5NKCaJSMWa2uHgWxX13nGJ\",\n" + + "\"NULSd6HgjKGXg6dk1K7vagf4kLDktf7DwsoXg\",\n" + + "\"NULSd6HgZcP5H8Fg4y5Wf8AwiZ8nVhVZ4jBcS\",\n" + + "\"NULSd6HgbhkGyxzvvosnRYWgnLAusCuWrtLNT\",\n" + + "\"NULSd6HgU7dsGGbvWZBFcnLjGiJHz7ZA8x6to\",\n" + + "\"NULSd6HghrhYaMdRcskPkM8vB65XX9v88EJEv\",\n" + + "\"NULSd6HgXaZUYDy8DCopGMwEPnervgKbtqFDS\",\n" + + "\"NULSd6HgcC78MaUw7tDo88rmg61tHCvZoEaXP\",\n" + + "\"NULSd6Hga7pDvwJeQ3ufen3rubekkDFtWNZDg\",\n" + + "\"NULSd6HgYLo5hPNcgqKtNtpA8dhC3Y37v5Ra9\",\n" + + "\"NULSd6Hghv5CQdQwfjATtw76MuWTnP7DT4xER\",\n" + + "\"NULSd6HgZeQRuhxXZbCAELYHNVEm8bvSULR27\",\n" + + "\"NULSd6HgiCCVyZvs162WNS6Gzvf22aFN8Y47P\",\n" + + "\"NULSd6HgdcJnk1R18vS73DGj38EtWMMdipogY\",\n" + + "\"NULSd6HgWTKbD7YBAAvP7NjKik4nRWuSw76Ny\",\n" + + "\"NULSd6HgYTwiDWmisFDqgDzcK8Sf197G3L28Z\",\n" + + "\"NULSd6Hgj56Sotnk28qnRWoeQ2Ew3KuPAXnpg\",\n" + + "\"NULSd6HgjHLnaPdyPYADSZy9UqewvJFEkAUP1\",\n" + + "\"NULSd6HgbcWZAxSGf38JxX9opKwgVuC6B8Hin\",\n" + + "\"NULSd6HgjF8iCrjpymFy6LVRmEjQG8AFayFDi\",\n" + + "\"NULSd6HgcUQ4paNjBiRSXevwpYGhVVnvwdks8\",\n" + + "\"NULSd6HgfVbGkmqCD1ycCPj2ZMJ7hYLrBu6eM\",\n" + + "\"NULSd6Hghpg9Nk7BNrsAccV49FAVyvMqCVWnv\",\n" + + "\"NULSd6HgX4mBo5v9nwESRwFn9Ns9LUqYAE91L\",\n" + + "\"NULSd6Hgh1HF2wmtRRTZTwYiVUGVriJnm8Ucs\",\n" + + "\"NULSd6HgZDQifPEXXTmUa2RzLLCrS4kzauf5C\",\n" + + "\"NULSd6HgVsgcK6Mt4cPyyPBZ9umZnacb7bAr7\",\n" + + "\"NULSd6HgdMZ6fzUp4my8VkascvWx2LcKJNFMp\",\n" + + "\"NULSd6HgVtmHWQsKidqHuTB1cV9kGPVciXNXk\",\n" + + "\"NULSd6HgVrfwxnmh7ycBddC8NDQ5LqDz6vK69\",\n" + + "\"NULSd6Hge5eGAaryhAQtZjHxSNw1qwDtHARHJ\",\n" + + "\"NULSd6HgcXGFs46UbyNDUaLuE4AviF5GCTbyh\",\n" + + "\"NULSd6HgeLusFRaAJNkR9ofm5Rx32F1whpKe4\",\n" + + "\"NULSd6Hgd81Ce2HqUmgFxwLvwPNXknGbaaNMu\",\n" + + "\"NULSd6HggQ1xMawWTMWyPtKWciMfR4CTavLrp\",\n" + + "\"NULSd6HgWvZUZTRzTURM8hRmWBvpzVmHTB1gn\",\n" + + "\"NULSd6HghnX3XnuFFTLfzx6TEzMsX6RKeZWsu\",\n" + + "\"NULSd6HgW5vV415MNoY2JTCaxa7NhcaHSo8Fg\",\n" + + "\"NULSd6Hgezi6y7LCRW4iLrXELyvH36fN12wHK\",\n" + + "\"NULSd6HgctDviYK6yDBKJd6WGhRRkByLhUrva\",\n" + + "\"NULSd6HgZbtnPKbxWAhg994HNQG76wSs4RAPq\",\n" + + "\"NULSd6HgZBcw88QkNen1wdM7EVaJ595kkHddN\",\n" + + "\"NULSd6HgiQ5CTko7Zx59vcBeHyxPAJQ7P8T48\",\n" + + "\"NULSd6HgXfnDCizGjLfBxrkV59WN4uTGzHMdi\",\n" + + "\"NULSd6HggpjM8RB5WbjzLc7bLvQDjHuRcongN\",\n" + + "\"NULSd6HgZZiqYSDiyz3xGN4tzNhgrho9EN59H\",\n" + + "\"NULSd6HgdNumANdW3LxB7NEZd4oa7otR4LkPN\",\n" + + "\"NULSd6HgcpKcxYFkeRDg8MJrSEF1A1SkH2KRM\",\n" + + "\"NULSd6HgXhUTCKGEwHiGmnPmWFAvXyANTdjrn\",\n" + + "\"NULSd6Hgh5VupJJ7Evabv9QQ2Pst8mjPS4dXT\",\n" + + "\"NULSd6HgWyGYLML5CadRiND5RJghYc5vbiycJ\",\n" + + "\"NULSd6HgfLT3nmbxtHZm8CsiTwjs1HxXJtmDT\",\n" + + "\"NULSd6HgggfeRCjx5Ka4LVRug4i6q5ymfaag8\",\n" + + "\"NULSd6HgYE7AKJmkAoPtjXxSHPkqxzmyPebkT\",\n" + + "\"NULSd6HghcXawGBzwaufEoHchhWJrsJwSsitY\",\n" + + "\"NULSd6HgfwTZKqKVnV3awiDKnEbF7RjZufWCN\",\n" + + "\"NULSd6Hgfd4H28qGCrzGdhgX2G5PKj6rejsUG\",\n" + + "\"NULSd6HgeTroMh3M59hbMWqeYqbgVXioa8Jmz\",\n" + + "\"NULSd6HgefSM6RkURTdWu1i9mB96ufGfxqg71\",\n" + + "\"NULSd6HghMrN2DTVmcBgiomKhvUETkg6c6N8E\",\n" + + "\"NULSd6HgZivXvXs4su6cuyFzgtBTkk9fTqxyy\",\n" + + "\"NULSd6HgWWEmZSxffcNVHc1kjbebkejWjVtpV\",\n" + + "\"NULSd6HgbBmFpomGuvmSa76dirtzAt2rWKn4w\",\n" + + "\"NULSd6HgXNrFd9NJMF5ExuSnGteKgHSKsfmXX\",\n" + + "\"NULSd6HgiYHK1WWeNWk1Dx1wUb1usQXQXic11\",\n" + + "\"NULSd6Hge7xHDnvsSpnzbR2gWHd31zJ1How11\",\n" + + "\"NULSd6Hgc5VNP4rF4wxdiXEQKpBKUE4w5RS22\",\n" + + "\"NULSd6HgeQwXLdre69ArkqVZNDqMLU4CaAz33\",\n" + + "\"NULSd6HgcjAKAgq8jjXgBCcNLEJUvJEYcoj44\",\n" + + "\"NULSd6HgiDdTjcuvhqzm3bomyBFZmosV3ei55\"\n" + + " ],\n" + + " \"registerTime\":0\n" + + " }"); tx.setTxData(txData.serialize()); CoinData coinData = new CoinData(); CoinFrom from = new CoinFrom(); from.setAddress(address); - from.setAmount(BigInteger.valueOf(1000000)); - from.setAssetsChainId(2); + from.setAmount(BigInteger.valueOf(30000000)); + from.setAssetsChainId(1); from.setAssetsId(1); from.setLocked((byte) 0); - from.setNonce(HexUtil.decode("ace23d6fad9760d0")); + from.setNonce(HexUtil.decode("7bf509a99dbeceb5")); coinData.getFrom().add(from); CoinTo to = new CoinTo(); to.setAddress(address); to.setAmount(BigInteger.ZERO); to.setAssetsId(1); - to.setAssetsChainId(2); + to.setAssetsChainId(1); to.setLockTime(0); coinData.getTo().add(to); @@ -71,7 +747,8 @@ public void test() throws Exception { tx.setTransactionSignature(transactionSignature.serialize()); Log.info(tx.getHash().toHex()); Log.info(HexUtil.encode(tx.serialize())); - sendTx(2, HexUtil.encode(tx.serialize())); + Log.info("" + tx.size()); +// sendTx(2, HexUtil.encode(tx.serialize())); } @SuppressWarnings("unchecked") diff --git a/module/nuls-transaction/pom.xml b/module/nuls-transaction/pom.xml index fd41bb3cff..72c3b9e522 100644 --- a/module/nuls-transaction/pom.xml +++ b/module/nuls-transaction/pom.xml @@ -11,11 +11,6 @@ nuls-transaction - - io.nuls.v2 - nuls-core-h2 - ${core.version} - com.google.code.gson gson From 70f3156fb25693dcd239221936092bbe2d1f9b8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 09:37:50 +0800 Subject: [PATCH 02/75] Bump gson from 2.8.5 to 2.8.9 in /module/nuls-transaction (#665) Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- module/nuls-transaction/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/nuls-transaction/pom.xml b/module/nuls-transaction/pom.xml index 72c3b9e522..33f73027bd 100644 --- a/module/nuls-transaction/pom.xml +++ b/module/nuls-transaction/pom.xml @@ -14,7 +14,7 @@ com.google.code.gson gson - 2.8.5 + 2.8.9 test From 095618ba4fcfce5322de9249741ce412c6157170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 09:38:38 +0800 Subject: [PATCH 03/75] Bump junit from 4.12 to 4.13.1 in /module/nuls-smart-contract (#666) Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- module/nuls-smart-contract/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/nuls-smart-contract/pom.xml b/module/nuls-smart-contract/pom.xml index b008d2c164..4a7f068f02 100644 --- a/module/nuls-smart-contract/pom.xml +++ b/module/nuls-smart-contract/pom.xml @@ -107,7 +107,7 @@ junit junit - 4.12 + 4.13.1 From b3fd642a9e2c14cec469ff6f0ac4d233c1379825 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 09:39:35 +0800 Subject: [PATCH 04/75] Bump junit from 4.12 to 4.13.1 in /test/nuls-test (#668) Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/nuls-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nuls-test/pom.xml b/test/nuls-test/pom.xml index 461146b38d..4bb3225b8f 100644 --- a/test/nuls-test/pom.xml +++ b/test/nuls-test/pom.xml @@ -73,7 +73,7 @@ junit junit - 4.12 + 4.13.1 test From 37b55435ef2b32d2e8cd2e672183f04c96e1c225 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 09:39:54 +0800 Subject: [PATCH 05/75] Bump junit from 4.12 to 4.13.1 in /module/nuls-cross-chain/base-lib (#667) Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- module/nuls-cross-chain/base-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/nuls-cross-chain/base-lib/pom.xml b/module/nuls-cross-chain/base-lib/pom.xml index 9b1d34d24c..90a4b47b22 100644 --- a/module/nuls-cross-chain/base-lib/pom.xml +++ b/module/nuls-cross-chain/base-lib/pom.xml @@ -22,7 +22,7 @@ junit junit - 4.12 + 4.13.1 test From fc998ff81d5b421e1c957b690bec8af9d57a7be1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 09:41:20 +0800 Subject: [PATCH 06/75] 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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- module/nuls-smart-contract/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/nuls-smart-contract/pom.xml b/module/nuls-smart-contract/pom.xml index 4a7f068f02..3afd651c01 100644 --- a/module/nuls-smart-contract/pom.xml +++ b/module/nuls-smart-contract/pom.xml @@ -37,7 +37,7 @@ commons-io commons-io - 2.6 + 2.7 org.apache.commons From b3de73e30d80cbaf8de6ed06a4ddffc606cf11a1 Mon Sep 17 00:00:00 2001 From: Niels Date: Fri, 1 Jul 2022 10:02:43 +0800 Subject: [PATCH 07/75] Pre master (#673) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update error log * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 * 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 * add getBalanceList (#644) * test case * V2.10.0 (#645) * beta 跨链合约更新 * verser * update beta setting * version 290 * update array list limit * update test case * update * update * update * u * update max limit * args bug * update version control * remove log * version * fix bug about nuls-api in testnet * update error log * Merge branch 'release/prod' # Conflicts: # config/nuls.ncf # module.ncf # module/nuls-api/documents/nuls-api_JSONRPC.md # module/nuls-api/documents/nuls-api_RESTFUL.md # module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java # module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java # version * v2.9.2 * add some cmds * update message to data * test file * update contract info * v2.9.3 * update contract info * v2.9.3 * fix pr 638 * update api * update ncf * add getBalanceList * test disable asset * test disable asset * test disable asset * test disable asset * test case * 通过编译 * 通过编译 * 通过编译 * 通过编译 * 通过编译 Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * Master merge 2.10.0 (#646) * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * add log trace * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * add log trace * update 3g mem of contract module * contract db query optimize * update log * remove log trace * add txType * contract db query optimize testing * update cross token system contract * 调试主网配置 * es commit * version * 优化协议版本切换逻辑 * update * support multy asset with contract in nuls api module * update offline contract transaction * add contract time out * 测试日志 * clear old cache * update * test * update * update db initial * fix bug * fix bug about conflict contract transaction * 去掉多余日志 * fix bug about setContractGenerateTxTypes * 修复本地验证人丢失的问题 * add time out * remove test code * remove test log * remove unused code * remove test code * extend transaction sync time out * beta setting * smart contract 5G mem * version * smart contract 3G mem * update config * 2.9.0 (#622) * beta 跨链合约更新 * verser * update beta setting * version 290 * update array list limit * update test case * update * update * update * u * update max limit * args bug * update version control * remove log * version Co-authored-by: MIMIEYES * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * Prod api (#647) * add getBalanceList * update getBalanceList * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * add api blackAddressList * 黑名单列表 * 黑名单列表 * add api blackAddressList * blacklist * add api blackAddressList * add api blackAddressList * add api blackAddressList * 提交协议升级配置 * update block * blacklist * blacklist * recovery contract api * update pom of contract * update api of contract * update pom * add api blackAddressList * add api blackAddressList * 提交协议升级配置 * update test case * Release/beta (#652) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cro… * update errormsg * 每分钟重置黑名单地址 * 每分钟重置黑名单地址 * 每分钟重置黑名单地址 * update get contractLockBalance * Prod 19 (#653) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ch… * 提交12协议升级配置--允许资产重新注册跨链 * 恢复transfer * update test case * update get contractLockBalance * v2 coding * add api for block account * Develop add api (#654) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * 提交协议升级配置 * update block * update pom * update test case * 提交12协议升级配置--允许资产重新注册跨链 * 恢复transfer * update test case * add api for block account Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * account block v2 coding * config * update addcrossasset cmd * account block signature validation coding completed * test completed * update get contractLockBalance * Release/pre prod (#655) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * update test case * 2.12.1 * Release/pre prod 1.12.1 (#656) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * update api doc * add decimals for rpc * 2.12.2 * update rpc * Release/pre prod (#657) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * update api of account balance * Release/pre prod (#658) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#659) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * support nuls transfer on contract call * completed to support nuls transfer on contract call * update test case * 2.13.0-beta * optimize the api of broadcast tx * 2.12.3 * 2.12.3 * 2.12.5 * 2.12.5 (#660) * 2.12.3 * 2.12.3 * 2.12.5 * settings * 还原本地特殊处理代码 * fix ignore * fix v12 sync bugs * fix v12 sync bugs * Delay stop agent tx * Delay stop agent tx * dev config * update cmd * 增加api接口 * local-test success * local-test success * fix tx validator bug * fix tx validator bug * Release/pre prod -- 2.13.0 (#661) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ab… * modify nulstar oss url * Release/pre prod (#662) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * v2.13.0-whole * v2.13.0-whole * v2.13.0-whole * 增加查看跨链交易签名信息功能 * 增加查看跨链交易签名信息功能 * v2.13.1 remove dependency-fastjson * v2.13.1 remove dependency-fastjson * coding initial * remove unused packages * coding for internal-create * optimize code * add computeAddress for internal-create * update gas used of contract create on protocol 14 * update gas cost for contract execution failure * test settings * update multi address for contract call * test setting * test * test * update test case * v2.14.0 * v2.14.0 * v2.14.0 * add internal-create data to the contract result * update the validation of token name Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .gitignore | 2 +- build/gen_languages/en.properties | 5 + build/gen_languages/en_all.properties | 5 + build/gen_languages/zh-CHS.properties | 7 +- .../base/api/provider/block/BlockService.java | 1 + .../provider/block/BlockServiceForRpc.java | 5 + .../provider/consensus/ConsensusProvider.java | 1 + .../consensus/ConsensusProviderForRpc.java | 4 +- .../facade/GetStopAgentCoinDataReq.java | 44 + .../crosschain/CrossChainProvider.java | 9 + .../crosschain/CrossChainProviderForRpc.java | 28 + .../io/nuls/core/constant/TxStatusEnum.java | 4 +- .../java/io/nuls/core/constant/TxType.java | 12 + .../java/io/nuls/core/core/ioc/ScanUtil.java | 2 +- .../core/exception/NulsRuntimeException.java | 16 +- config/nuls.beta.ncf | 1 + config/nuls.ncf | 1 + genesis-block-dev-p.json | 14 + genesis-block-prod.json | 32345 ++++++++++++++++ genesis-block.json | 31787 ++++++++++++++- module-beta.ncf | 162 + module-dev-p.ncf | 174 + module-dev.ncf | 62 +- module-prod.ncf | 174 + module.ncf | 83 +- module/nuls-account/pom.xml | 16 + .../io/nuls/account/AccountBootstrap.java | 6 + .../io/nuls/account/config/AccountConfig.java | 10 + .../constant/AccountStorageConstant.java | 2 + .../account/helper/AccountBlockHelper.java | 123 + .../helper/AccountContractCallHelper.java | 119 + .../model/bo/tx/AccountBlockExtend.java | 97 + .../account/model/bo/tx/AccountBlockInfo.java | 144 + .../model/bo/tx/txdata/AccountBlockData.java | 97 + .../bo/tx/txdata/AccountContractCallData.java | 111 + .../account/model/dto/AccountBlockDTO.java | 76 + .../model/po/AccountBlockExtendPO.java | 160 + .../nuls/account/model/po/AccountBlockPO.java | 97 + .../model/po/AccountContractCallPO.java | 90 + .../nuls/account/model/vo/AccountBlockVO.java | 59 + .../nuls/account/rpc/cmd/AccountBlockCmd.java | 205 + .../io/nuls/account/rpc/cmd/AccountCmd.java | 91 +- .../nuls/account/service/AccountService.java | 8 + .../service/impl/AccountServiceImpl.java | 13 + .../storage/AccountBlockStorageService.java | 48 + ...rTransferOnContractCallStorageService.java | 51 + .../impl/AccountBlockStorageServiceImpl.java | 288 + ...nsferOnContractCallStorageServiceImpl.java | 127 + .../tx/v11/AccountLockProcessorV11.java | 187 + .../tx/v11/AccountUnlockProcessorV11.java | 187 + .../tx/v12/AccountLockProcessorV12.java | 234 + ...ForTransferOnContractCallProcessorV13.java | 217 + .../src/main/resources/protocol-config.json | 59 + .../java/io/nuls/account/tx/Transfer.java | 744 +- .../test/java/io/nuls/account/tx/TxTest.java | 8 +- .../io/nuls/account/util/AddressToolTest.java | 6 + module/nuls-api/documents/nuls-api_JSONRPC.md | 822 +- .../documents/nuls-api_Postman_JSONRPC.json | 2 +- .../documents/nuls-api_Postman_RESTFUL.json | 2 +- module/nuls-api/documents/nuls-api_RESTFUL.md | 627 +- module/nuls-api/pom.xml | 8 + .../java/io/nuls/provider/ApiBootstrap.java | 23 +- .../provider/api/cache/LedgerAssetCache.java | 79 + .../io/nuls/provider/api/config/Context.java | 5 + .../api/constant/CommandConstant.java | 1 + .../jsonrpc/controller/AccountController.java | 198 +- .../controller/ConsensusController.java | 29 + .../controller/ContractController.java | 24 + .../jsonrpc/controller/LegerController.java | 25 +- .../controller/TransactionController.java | 11 +- .../api/resources/AccountLedgerResource.java | 36 +- .../api/resources/AccountResource.java | 5 +- .../api/resources/ConsensusResource.java | 23 + .../api/resources/ContractResource.java | 19 + .../dto/AccountBalanceWithDecimalsDto.java | 109 + .../provider/model/dto/AccountBlockDTO.java | 61 + .../model/dto/ContractInternalCreateDto.java | 75 + .../provider/model/dto/ContractResultDto.java | 10 + .../model/dto/ContractTokenInfoDto.java | 12 +- .../model/dto/block/BlockHeaderDto.java | 4 +- .../model/form/AccountCreateForm.java | 2 +- .../consensus/GetStopAgentCoinDataForm.java | 50 + .../model/form/contract/ContractCodeHash.java | 49 + .../provider/model/jsonrpc/RpcResult.java | 8 + .../nuls/provider/rpctools/AccountTools.java | 73 + .../nuls/provider/rpctools/ContractTools.java | 16 + .../provider/rpctools/CrossChainTools.java | 52 + .../nuls/provider/rpctools/LegderTools.java | 112 +- .../provider/rpctools/vo/AccountBalance.java | 7 +- .../vo/AccountBalanceWithDecimals.java | 137 + .../io/nuls/provider/utils/ApiDocTool.java | 12 +- .../nuls/provider/utils/BlackListUtils.java | 58 + .../java/io/nuls/provider/utils/Utils.java | 5 +- .../message/handler/CompleteHandler.java | 2 +- .../java/io/nuls/block/rpc/BlockResource.java | 42 +- .../java/io/nuls/chain/rpc/cmd/AssetCmd.java | 2 +- .../io/nuls/chain/service/AssetService.java | 2 + .../nuls/chain/service/ValidateService.java | 1 + .../chain/service/impl/AssetServiceImpl.java | 6 + .../service/impl/ValidateServiceImpl.java | 24 + .../tx/v12/AddAssetTransferProcessor.java | 109 + .../src/main/resources/protocol-config.json | 18 + .../nuls/chain/test/RegCrossChainTxTest.java | 125 +- .../io/nuls/cmd/client/CommandHandler.java | 2 + .../main/java/io/nuls/cmd/client/Tools.java | 3 + .../account/GetPrivateKeyProcessor.java | 2 +- .../processor/block/RollbackProcessor.java | 97 + .../consensus/CreateAgentProcessor.java | 2 +- .../consensus/StopAgentProcessor.java | 2 +- .../crosschain/GetCrossTxStateProcessor.java | 39 +- .../transaction/TransferByAliasProcessor.java | 2 +- .../java/io/nuls/poc/ConsensusBootStrap.java | 24 +- .../io/nuls/poc/model/bo/tx/txdata/Agent.java | 2 +- .../model/bo/tx/txdata/DelayStopAgent.java | 89 + .../java/io/nuls/poc/rpc/cmd/AgentCmd.java | 88 +- .../io/nuls/poc/service/AgentService.java | 2 + .../poc/service/impl/AgentServiceImpl.java | 52 +- .../poc/service/impl/BlockServiceImpl.java | 11 +- .../poc/tx/v4/DelayStopAgentProcessor.java | 257 + .../utils/manager/FixRedPunishBugHelper.java | 49 + .../nuls/poc/utils/manager/PunishManager.java | 3 + .../nuls/poc/utils/manager/RoundManager.java | 6 + .../poc/utils/validator/BlockValidator.java | 8 +- .../nuls/poc/utils/validator/TxValidator.java | 117 +- .../src/main/resources/protocol-config.json | 17 + .../io/nuls/test/storage/AgentDBOperator.java | 42 + .../nuls/test/storage/DepositStorageTest.java | 62 +- .../nuls/rpc/cmd/CrossChainTxCmd.java | 1 + .../impl/ResetLocalVerifierServiceImpl.java | 2 +- .../imp/RegisteredCrossChainServiceImpl.java | 1 + .../utils/validator/CrossTxValidator.java | 4 +- .../src/main/resources/versions.json | 20 + module/nuls-smart-contract/pom.xml | 26 +- .../callable/ContractTxCallableV14.java | 291 + .../callable/ContractTxCallableV8.java | 2 - .../nuls/contract/config/ContractContext.java | 3 + .../constant/ContractCmdConstant.java | 1 + .../contract/constant/ContractConstant.java | 1 + .../nuls/contract/helper/ContractHelper.java | 236 +- .../contract/helper/ContractTxHelper.java | 29 +- .../manager/ContractTxValidatorManager.java | 6 + .../java/io/nuls/contract/model/bo/Chain.java | 6 + .../contract/model/bo/ContractCreate.java | 86 + .../model/bo/ContractInternalCreate.java | 65 + .../contract/model/bo/ContractResult.java | 23 +- .../contract/model/bo/ContractTokenInfo.java | 10 + .../contract/model/dto/AccountAmountDto.java | 65 + .../model/dto/ContractInternalCreateDto.java | 89 + .../contract/model/dto/ContractResultDto.java | 23 + .../model/dto/ContractTokenInfoDto.java | 13 +- .../processor/CallContractTxProcessor.java | 84 + .../processor/CreateContractTxProcessor.java | 75 +- .../nuls/contract/rpc/call/AccountCall.java | 17 + .../io/nuls/contract/rpc/cmd/ContractCmd.java | 16 +- .../rpc/resource/ContractResource.java | 83 +- .../contract/service/ContractService.java | 3 + .../contract/service/ContractTxService.java | 3 +- .../service/impl/ContractCallerImpl.java | 8 +- .../service/impl/ContractExecutorImpl.java | 6 +- .../service/impl/ContractServiceImpl.java | 60 + .../service/impl/ContractTxServiceImpl.java | 10 +- .../tx/SmartContractVersionChangeInvoker.java | 15 +- .../tx/v13/CallContractProcessorV13.java | 130 + .../tx/v14/CallContractProcessorV14.java | 127 + .../tx/v14/CreateContractProcessorV14.java | 115 + .../io/nuls/contract/util/ContractUtil.java | 39 +- .../main/java/io/nuls/contract/util/Log.java | 6 +- .../validator/CallContractTxValidator.java | 282 + .../java/io/nuls/contract/vm/GasCost.java | 2 + .../src/main/java/io/nuls/contract/vm/VM.java | 18 +- .../java/io/nuls/contract/vm/VMFactory.java | 72 +- .../contract/vm/code/ClassCodeLoader.java | 56 +- .../io/nuls/contract/sdk/NativeAddress.java | 13 +- .../io/nuls/contract/sdk/NativeBlock.java | 7 +- .../io/nuls/contract/sdk/NativeMsg.java | 16 +- .../io/nuls/contract/sdk/NativeUtils.java | 206 +- .../contract/vm/program/ProgramCreate.java | 10 + .../vm/program/ProgramCreateData.java | 171 + .../vm/program/ProgramEncodePacked.java | 93 + .../contract/vm/program/ProgramExecutor.java | 5 + .../vm/program/ProgramInternalCreate.java | 94 + .../contract/vm/program/ProgramResult.java | 10 + .../vm/program/impl/ProgramConstants.java | 99 +- .../vm/program/impl/ProgramExecutorImpl.java | 81 +- .../vm/program/impl/ProgramInvoke.java | 9 + .../java/io/nuls/contract/vm/util/Utils.java | 34 + .../src/main/resources/protocol-config.json | 42 + .../src/main/resources/used_classes_sdk_v14 | Bin 0 -> 14610 bytes .../test/java/io/nuls/contract/base/Base.java | 6 + .../io/nuls/contract/tx/base/BaseQuery.java | 50 +- .../ContractCreateSendTxTest.java | 122 + .../ContractMakeAndBroadcastBase.java | 2 +- .../tx/multiSign/MultiSignTxTest.java | 131 +- .../tx/multyasset/ContractMultyAssetTest.java | 48 +- .../tx/nrc20/ContractNRC20TokenQueryTest.java | 5 +- .../nrc20/ContractNRC20TokenSendTxTest.java | 40 +- .../tx/pocm/ContractPOCMSendTxTest.java | 80 +- .../tx/randomseed/RandomSeedSendTxTest.java | 3 - .../io/nuls/contract/util/BeanUtilTest.java | 18 +- .../contract/util/ContractDBUtilTest.java | 11 +- .../io/nuls/contract/util/LedgerTestUtil.java | 52 + module/nuls-transaction/module.ncf | 1 - .../transaction/TransactionBootstrap.java | 17 +- .../nuls/transaction/constant/TxConfig.java | 19 + .../nuls/transaction/constant/TxContext.java | 11 + .../transaction/constant/TxErrorCode.java | 1 + .../model/dto/AccountBlockDTO.java | 68 + .../model/po/AccountBlockExtendPO.java | 145 + .../transaction/model/po/AccountBlockPO.java | 86 + .../transaction/rpc/call/AccountCall.java | 52 + .../service/impl/TxServiceImpl.java | 174 +- .../io/nuls/transaction/utils/TxUtil.java | 14 + .../main/resources/languages/en.properties | 1 + .../src/main/resources/module.json | 3 +- .../io/nuls/transaction/tx/TxSignTest.java | 156 +- package | 2 +- pom.xml | 4 +- .../src/main/java/io/nuls/test/Test.java | 21 +- version | 2 +- 219 files changed, 74487 insertions(+), 2706 deletions(-) create mode 100644 common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java create mode 100644 genesis-block-dev-p.json create mode 100644 genesis-block-prod.json create mode 100644 module-beta.ncf create mode 100644 module-dev-p.ncf create mode 100644 module-prod.ncf create mode 100644 module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockPO.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java create mode 100644 module/nuls-account/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/api/cache/LedgerAssetCache.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBalanceWithDecimalsDto.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBlockDTO.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractInternalCreateDto.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/form/consensus/GetStopAgentCoinDataForm.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractCodeHash.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/rpctools/CrossChainTools.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalanceWithDecimals.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/utils/BlackListUtils.java create mode 100644 module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java create mode 100644 module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/block/RollbackProcessor.java create mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java create mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java create mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java create mode 100644 module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentDBOperator.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java create mode 100644 module/nuls-smart-contract/src/main/resources/used_classes_sdk_v14 create mode 100644 module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java create mode 100644 module/nuls-smart-contract/src/test/java/io/nuls/contract/util/LedgerTestUtil.java create mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java create mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java create mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java diff --git a/.gitignore b/.gitignore index bd9502f93b..276b3a5dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -116,7 +116,7 @@ buildNumber.properties # log logs/ /data-prod/ -/data*/ +/data/ !tools/nuls-tools/base-tools/src/main/java/io/nuls/base/data keystore/ Modules/ diff --git a/build/gen_languages/en.properties b/build/gen_languages/en.properties index b57edd1b9b..d9ea63f4b3 100644 --- a/build/gen_languages/en.properties +++ b/build/gen_languages/en.properties @@ -374,3 +374,8 @@ tx_0036=Multi-sign account is not exist tx_0037=Transaction verify failed tx_0038=Contract transaction verify failed tx_0039=The transaction was confirmed +tx_0040=System transactions cannot circulated directly through the network +tx_0041=System contract transactions cannot circulated directly through the network +tx_0042=Block Contains multiple unique transactions +tx_0043=Exist gas transactions without smart contract return transactions +tx_0044=Block address diff --git a/build/gen_languages/en_all.properties b/build/gen_languages/en_all.properties index b57edd1b9b..b73d64c8ab 100644 --- a/build/gen_languages/en_all.properties +++ b/build/gen_languages/en_all.properties @@ -374,3 +374,8 @@ tx_0036=Multi-sign account is not exist tx_0037=Transaction verify failed tx_0038=Contract transaction verify failed tx_0039=The transaction was confirmed +tx_0040=System transactions cannot circulated directly through the network +tx_0041=System contract transactions cannot circulated directly through the network +tx_0042=Block Contains multiple unique transactions +tx_0043=Exist gas transactions without smart contract return transactions +tx_0044=Block address \ No newline at end of file diff --git a/build/gen_languages/zh-CHS.properties b/build/gen_languages/zh-CHS.properties index 68e00466eb..38de6a50f7 100644 --- a/build/gen_languages/zh-CHS.properties +++ b/build/gen_languages/zh-CHS.properties @@ -374,4 +374,9 @@ tx_0035=\u591A\u91CD\u7B7E\u540D\u4EA4\u6613\u7684\u53D1\u4EF6\u4EBA\u53EA\u6709 tx_0036=\u4E0D\u5B58\u5728\u591A\u91CD\u7B7E\u540D\u5E10\u6237 tx_0037=\u4EA4\u6613\u9A8C\u8BC1\u5931\u8D25 tx_0038=\u5408\u7EA6\u4EA4\u6613\u9A8C\u8BC1\u5931\u8D25 -tx_0039=\u4EA4\u6613\u5DF2\u786E\u8BA4 \ No newline at end of file +tx_0039=\u4EA4\u6613\u5DF2\u786E\u8BA4 +tx_0040=System transactions cannot circulated directly through the network +tx_0041=System contract transactions cannot circulated directly through the network +tx_0042=Block Contains multiple unique transactions +tx_0043=Exist gas transactions without smart contract return transactions +tx_0044=Block address \ No newline at end of file diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockService.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockService.java index a0ad67c5f9..3a9d37fd42 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockService.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockService.java @@ -20,4 +20,5 @@ public interface BlockService { Result getBlockHeaderByLastHeight(GetBlockHeaderByLastHeightReq req); + Result rollback(GetBlockHeaderByHeightReq getBlockHeaderByHeightReq); } diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java index 75d649a0d0..6aa0829c43 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java @@ -48,6 +48,11 @@ public Result getBlockHeaderByLastHeight(GetBlockHeaderByLastHe return _call("latestBlockHeaderPo", req, this::tranderBlockHeader); } + @Override + public Result rollback(GetBlockHeaderByHeightReq req) { + return _call("roll_back", req, this::tranderBlockHeader); + } + @Override protected Result call(String method, Object req, Function res) { return callRpc(ModuleE.BL.abbr, method, req, res); diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java index f059cda320..8032feafbc 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java @@ -32,6 +32,7 @@ public interface ConsensusProvider { * @return */ Result stopAgent(StopAgentReq req); + Result getStopAgentCoinData(GetStopAgentCoinDataReq req); /** * stop consensus node diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java index 162f7401c7..4bce6dcdbb 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java @@ -41,7 +41,9 @@ public Result createAgentForMultiSignAccount(CreateMultiSi public Result stopAgent(StopAgentReq req) { return callReturnString("cs_stopAgent",req,"txHash"); } - + public Result getStopAgentCoinData(GetStopAgentCoinDataReq req){ + return callReturnString("cs_getStopAgentCoinData",req,"value"); + } @Override public Result stopAgentForMultiSignAccount(StopMultiSignAgentReq req) { return callRpc(ModuleE.CS.abbr,"cs_stopMultiAgent",req,(Function)(data-> success(MapUtils.mapToBean(data,new MultiSignTransferRes())))); diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java new file mode 100644 index 0000000000..9bfa9173da --- /dev/null +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java @@ -0,0 +1,44 @@ +package io.nuls.base.api.provider.consensus.facade; + +import io.nuls.base.api.provider.BaseReq; + +/** + * @Author: zhoulijun + * @Time: 2019-03-11 11:51 + * @Description: + * 停止共识 + * stop consensus + */ +public class GetStopAgentCoinDataReq extends BaseReq { + + /** + * 共识地址 + */ + String agentHash; + + long lockHeight; + + public GetStopAgentCoinDataReq() { + } + + public GetStopAgentCoinDataReq(String agentHash, long lockHeight) { + this.agentHash = agentHash; + this.lockHeight = lockHeight; + } + + public String getAgentHash() { + return agentHash; + } + + public void setAgentHash(String agentHash) { + this.agentHash = agentHash; + } + + public long getLockHeight() { + return lockHeight; + } + + public void setLockHeight(long lockHeight) { + this.lockHeight = lockHeight; + } +} diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java index 3c1bbb43ce..fc1c16128e 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java @@ -2,6 +2,7 @@ import io.nuls.base.api.provider.Result; import io.nuls.base.api.provider.crosschain.facade.*; +import io.nuls.base.data.Transaction; /** * @Author: zhoulijun @@ -25,6 +26,14 @@ public interface CrossChainProvider { */ Result getCrossTxState(GetCrossTxStateReq req); + + /** + * 查询跨链交易在其他链的处理状态 + * @param req + * @return + */ + Result getCrossTx(GetCrossTxStateReq req); + /** * 给全网发信号，对指定跨链交易重新进行拜赞庭验证 * @param req diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java index 21dac493cc..ec19b70036 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java @@ -1,9 +1,17 @@ package io.nuls.base.api.provider.crosschain; +import io.nuls.base.RPCUtil; import io.nuls.base.api.provider.BaseRpcService; import io.nuls.base.api.provider.Provider; import io.nuls.base.api.provider.Result; import io.nuls.base.api.provider.crosschain.facade.*; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.data.Transaction; +import io.nuls.core.constant.CommonCodeConstanst; +import io.nuls.core.constant.TxStatusEnum; +import io.nuls.core.exception.NulsException; +import io.nuls.core.log.Log; +import io.nuls.core.model.StringUtils; import io.nuls.core.parse.MapUtils; import io.nuls.core.rpc.model.ModuleE; @@ -41,6 +49,11 @@ public Result getCrossTxState(GetCrossTxStateReq req) { }); } + @Override + public Result getCrossTx(GetCrossTxStateReq req) { + return call("getCrossChainTxInfoForCtxStatusPO",req,(Function)this::tranderTransaction); + } + @Override public Result rehandleCtx(RehandleCtxReq req) { return callReturnString("ctxRehandle",req,"msg"); @@ -56,4 +69,19 @@ private Result _call(String method, Object req, Function cal return call(method,req,callback); } + private Result tranderTransaction(String hexString){ + try { + if(StringUtils.isNull(hexString)){ + return fail(CommonCodeConstanst.DATA_NOT_FOUND,"not found tx"); + } + Transaction transaction = new Transaction(); + transaction.parse(new NulsByteBuffer(RPCUtil.decode(hexString))); + return success(transaction); + } catch (NulsException e) { + Log.error("反序列化transaction发生异常",e); + return fail(CommonCodeConstanst.DESERIALIZE_ERROR); + } + } + + } diff --git a/common/nuls-core/src/main/java/io/nuls/core/constant/TxStatusEnum.java b/common/nuls-core/src/main/java/io/nuls/core/constant/TxStatusEnum.java index c16f7be6e6..c0acc56fdd 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/constant/TxStatusEnum.java +++ b/common/nuls-core/src/main/java/io/nuls/core/constant/TxStatusEnum.java @@ -27,7 +27,9 @@ /** * 交易状态枚举 * Enumeration of transaction status - * + * 0: not packaged + * 1: packaged and saved + * 2: packaged and saved * @author Niels */ public enum TxStatusEnum { diff --git a/common/nuls-core/src/main/java/io/nuls/core/constant/TxType.java b/common/nuls-core/src/main/java/io/nuls/core/constant/TxType.java index 9209031ca7..e329ccc08f 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/constant/TxType.java +++ b/common/nuls-core/src/main/java/io/nuls/core/constant/TxType.java @@ -170,6 +170,9 @@ public class TxType { */ public static final int BATCH_STAKING_MERGE = 33; + + public static final int DELAY_STOP_AGENT = 34; + /** * 创建交易对 */ @@ -292,4 +295,13 @@ public class TxType { public static final int RESET_CHAIN_INFO = 62; + public static final int BLOCK_ACCOUNT = 63; + + public static final int UNBLOCK_ACCOUNT = 64; + + /** + * 调用合约允许普通转账的账户白名单 + */ + public static final int ACCOUNT_FOR_TRANSFER_ON_CONTRACT_CALL = 65; + } diff --git a/common/nuls-core/src/main/java/io/nuls/core/core/ioc/ScanUtil.java b/common/nuls-core/src/main/java/io/nuls/core/core/ioc/ScanUtil.java index a83256a3d5..bb9863bd2f 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/core/ioc/ScanUtil.java +++ b/common/nuls-core/src/main/java/io/nuls/core/core/ioc/ScanUtil.java @@ -131,7 +131,7 @@ private static void findClassJar(String packageName, String pathName, Listio.nuls.v2 nuls-base-protocol-update + + io.nuls.v2 + sdk4j + 1.1.6.RELEASE + test + + + org.mybatis + mybatis + + + io.nuls.v2 + nuls-core-h2 + + + nuls-module-account diff --git a/module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java b/module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java index 91ff1b20a2..673b1a120c 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java +++ b/module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java @@ -194,6 +194,12 @@ private void initDB() throws Exception { if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_MULTI_SIG_ACCOUNT)) { RocksDBService.createTable(AccountStorageConstant.DB_NAME_MULTI_SIG_ACCOUNT); } + if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK)) { + RocksDBService.createTable(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK); + } + if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL)) { + RocksDBService.createTable(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL); + } } catch (Exception e) { if (!DBErrorCode.DB_TABLE_EXIST.equals(e.getMessage())) { LoggerUtil.LOG.error(e.getMessage()); diff --git a/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java b/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java index 0456d4d51e..c25fc5eba2 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java +++ b/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java @@ -44,6 +44,16 @@ public class AccountConfig implements ModuleConfig { private String blackHolePublicKey; + private String blockAccountManager; + + public String getBlockAccountManager() { + return blockAccountManager; + } + + public void setBlockAccountManager(String blockAccountManager) { + this.blockAccountManager = blockAccountManager; + } + public String getBlackHolePublicKey() { return blackHolePublicKey; } diff --git a/module/nuls-account/src/main/java/io/nuls/account/constant/AccountStorageConstant.java b/module/nuls-account/src/main/java/io/nuls/account/constant/AccountStorageConstant.java index 17ac2b0260..d912483a97 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/constant/AccountStorageConstant.java +++ b/module/nuls-account/src/main/java/io/nuls/account/constant/AccountStorageConstant.java @@ -54,5 +54,7 @@ public interface AccountStorageConstant { * Account Module Configuration Information Table Name */ String DB_NAME_ACCOUNT_CONGIF = "config"; + String DB_NAME_ACCOUNT_BLOCK = "account_block"; + String DB_NAME_ACCOUNT_CONTRACT_CALL = "account_contract_call"; } diff --git a/module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java b/module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java new file mode 100644 index 0000000000..9cbb66de63 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java @@ -0,0 +1,123 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.account.helper; + +import io.nuls.account.config.AccountConfig; +import io.nuls.account.config.NulsConfig; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.tx.AccountBlockExtend; +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.account.model.bo.tx.txdata.AccountBlockData; +import io.nuls.account.util.TxUtil; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.CoinData; +import io.nuls.base.data.CoinFrom; +import io.nuls.base.data.CoinTo; +import io.nuls.base.data.Transaction; +import io.nuls.core.basic.Result; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.List; + +import static io.nuls.account.util.TxUtil.getSuccess; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +@Component +public class AccountBlockHelper { + + @Autowired + private AccountConfig accountConfig; + + + public Result blockAccountTxValidate(Chain chain, Transaction tx) throws NulsException { + CoinData coinData = TxUtil.getCoinData(tx); + List listFrom = coinData.getFrom(); + List listTo = coinData.getTo(); + if (null == listFrom || listFrom.size() == 0) { + return Result.getFailed(AccountErrorCode.TX_COINFROM_NOT_FOUND); + } + int chainId = chain.getConfig().getChainId(); + if (listFrom.size() > 1) { + return Result.getFailed(AccountErrorCode.COINDATA_IS_INCOMPLETE); + } + CoinFrom coinFrom = listFrom.get(0); + String fromStr = AddressTool.getStringAddressByBytes(coinFrom.getAddress()); + if (!fromStr.equals(accountConfig.getBlockAccountManager())) { + chain.getLogger().error("error: not manager, tx: {}, config: {}", fromStr, accountConfig.getBlockAccountManager()); + return Result.getFailed(AccountErrorCode.COINDATA_IS_INCOMPLETE); + } + AccountBlockData txData = new AccountBlockData(); + txData.parse(tx.getTxData(), 0); + String[] addresses = txData.getAddresses(); + if (addresses.length == 0) { + chain.getLogger().error("empty addresses"); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + // 检查白名单 + byte[] txDataExtend = txData.getExtend(); + if (txDataExtend != null) { + AccountBlockExtend abExtend = new AccountBlockExtend(); + abExtend.parse(txDataExtend, 0); + AccountBlockInfo[] infos = abExtend.getInfos(); + if (addresses.length != infos.length) { + chain.getLogger().error("inconsistent address data in txData"); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + } + for (String addr : addresses) { + if (addr.equals(accountConfig.getBlockAccountManager())) { + chain.getLogger().error("error: manager can not in it"); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + } + int addrChainId = AddressTool.getChainIdByAddress(coinFrom.getAddress()); + //黑洞地址不能发起转账 + if (AddressTool.isBlackHoleAddress(NulsConfig.BLACK_HOLE_PUB_KEY, addrChainId, coinFrom.getAddress())) { + return Result.getFailed(AccountErrorCode.ADDRESS_TRANSFER_BAN); + } + // 发送方from中地址对应的链id必须是发起链的id + if (chainId != addrChainId) { + return Result.getFailed(AccountErrorCode.CHAINID_ERROR); + } + + if (null == listTo || listTo.size() == 0) { + return Result.getFailed(AccountErrorCode.TX_COINTO_NOT_FOUND); + } + for (CoinTo coinTo : listTo) { + int toAddrChainId = AddressTool.getChainIdByAddress(coinTo.getAddress()); + // 接收方to中地址对应的链id必须发起链id + if (chainId != toAddrChainId) { + return Result.getFailed(AccountErrorCode.CHAINID_ERROR); + } + } + return getSuccess(); + + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java b/module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java new file mode 100644 index 0000000000..30c32d0f24 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java @@ -0,0 +1,119 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.account.helper; + +import io.nuls.account.config.AccountConfig; +import io.nuls.account.config.NulsConfig; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.tx.txdata.AccountContractCallData; +import io.nuls.account.util.TxUtil; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.CoinData; +import io.nuls.base.data.CoinFrom; +import io.nuls.base.data.CoinTo; +import io.nuls.base.data.Transaction; +import io.nuls.core.basic.Result; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.List; + +import static io.nuls.account.util.TxUtil.getSuccess; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +@Component +public class AccountContractCallHelper { + + @Autowired + private AccountConfig accountConfig; + + + public Result validate(Chain chain, Transaction tx) throws NulsException { + CoinData coinData = TxUtil.getCoinData(tx); + List listFrom = coinData.getFrom(); + List listTo = coinData.getTo(); + if (null == listFrom || listFrom.size() == 0) { + return Result.getFailed(AccountErrorCode.TX_COINFROM_NOT_FOUND); + } + int chainId = chain.getConfig().getChainId(); + if (listFrom.size() > 1) { + return Result.getFailed(AccountErrorCode.COINDATA_IS_INCOMPLETE); + } + CoinFrom coinFrom = listFrom.get(0); + String fromStr = AddressTool.getStringAddressByBytes(coinFrom.getAddress()); + if (!fromStr.equals(accountConfig.getBlockAccountManager())) { + chain.getLogger().error("error: not manager, tx: {}, config: {}", fromStr, accountConfig.getBlockAccountManager()); + return Result.getFailed(AccountErrorCode.COINDATA_IS_INCOMPLETE); + } + AccountContractCallData txData = new AccountContractCallData(); + txData.parse(tx.getTxData(), 0); + int type = txData.getType(); + if (type != 1 && type != 2) { + chain.getLogger().error("error type: {}", type); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + String[] addresses = txData.getAddresses(); + if (addresses.length == 0) { + chain.getLogger().error("empty addresses"); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + for (String addr : addresses) { + if (!AddressTool.validAddress(chainId, addr)) { + chain.getLogger().error("error address: {}", addr); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + if (addr.equals(accountConfig.getBlockAccountManager())) { + chain.getLogger().error("error: manager can not in it"); + return Result.getFailed(AccountErrorCode.TX_DATA_VALIDATION_ERROR); + } + } + int addrChainId = AddressTool.getChainIdByAddress(coinFrom.getAddress()); + //黑洞地址不能发起转账 + if (AddressTool.isBlackHoleAddress(NulsConfig.BLACK_HOLE_PUB_KEY, addrChainId, coinFrom.getAddress())) { + return Result.getFailed(AccountErrorCode.ADDRESS_TRANSFER_BAN); + } + // 发送方from中地址对应的链id必须是发起链的id + if (chainId != addrChainId) { + return Result.getFailed(AccountErrorCode.CHAINID_ERROR); + } + + if (null == listTo || listTo.size() == 0) { + return Result.getFailed(AccountErrorCode.TX_COINTO_NOT_FOUND); + } + for (CoinTo coinTo : listTo) { + int toAddrChainId = AddressTool.getChainIdByAddress(coinTo.getAddress()); + // 接收方to中地址对应的链id必须发起链id + if (chainId != toAddrChainId) { + return Result.getFailed(AccountErrorCode.CHAINID_ERROR); + } + } + return getSuccess(); + + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java new file mode 100644 index 0000000000..57c1e16542 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java @@ -0,0 +1,97 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.bo.tx; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/21 + */ +public class AccountBlockExtend extends BaseNulsData { + + private AccountBlockInfo[] infos; + + private byte[] extend; + + public AccountBlockExtend() { + } + + @Override + public int size() { + int size = 0; + // length + size += SerializeUtils.sizeOfUint16(); + for (AccountBlockInfo info : infos) { + size += SerializeUtils.sizeOfNulsData(info); + } + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.writeUint16(infos.length); + for (AccountBlockInfo info : infos) { + stream.writeNulsData(info); + } + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + int length = byteBuffer.readUint16(); + AccountBlockInfo[] _infos = new AccountBlockInfo[length]; + for (int i = 0; i < length; i++) { + _infos[i] = byteBuffer.readNulsData(new AccountBlockInfo()); + } + this.infos = _infos; + this.extend = byteBuffer.readByLengthByte(); + } + + public AccountBlockInfo[] getInfos() { + return infos; + } + + public void setInfos(AccountBlockInfo[] infos) { + this.infos = infos; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java new file mode 100644 index 0000000000..7d4456c078 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java @@ -0,0 +1,144 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.bo.tx; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/21 + */ +public class AccountBlockInfo extends BaseNulsData { + + /** + * 1-增加白名单 2-删除白名单 + */ + private int operationType; + private int[] types; + private String[] contracts; + private byte[] extend; + + public AccountBlockInfo() { + } + + @Override + public int size() { + int size = 0; + size += SerializeUtils.sizeOfUint16(); + // length + size += SerializeUtils.sizeOfUint16(); + if (types != null) { + size += SerializeUtils.sizeOfUint16() * types.length; + } + size += SerializeUtils.sizeOfUint16(); + if (contracts != null) { + for (String contract : contracts) { + size += SerializeUtils.sizeOfString(contract); + } + } + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.writeUint16(operationType); + if (types == null) { + stream.writeUint16(0); + } else { + stream.writeUint16(types.length); + for (int type : types) { + stream.writeUint16(type); + } + } + if (contracts == null) { + stream.writeUint16(0); + } else { + stream.writeUint16(contracts.length); + for (String address : contracts) { + stream.writeString(address); + } + } + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.operationType = byteBuffer.readUint16(); + int length0 = byteBuffer.readUint16(); + int[] _types = new int[length0]; + for (int i = 0; i < length0; i++) { + _types[i] = byteBuffer.readUint16(); + } + int length = byteBuffer.readUint16(); + String[] _addresses = new String[length]; + for (int i = 0; i < length; i++) { + _addresses[i] = byteBuffer.readString(); + } + this.types = _types; + this.contracts = _addresses; + this.extend = byteBuffer.readByLengthByte(); + } + + public int getOperationType() { + return operationType; + } + + public void setOperationType(int operationType) { + this.operationType = operationType; + } + + public int[] getTypes() { + return types; + } + + public void setTypes(int[] types) { + this.types = types; + } + + public String[] getContracts() { + return contracts; + } + + public void setContracts(String[] contracts) { + this.contracts = contracts; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java new file mode 100644 index 0000000000..50c7845e77 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java @@ -0,0 +1,97 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.bo.tx.txdata; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +public class AccountBlockData extends BaseNulsData { + + private String[] addresses; + + private byte[] extend; + + public AccountBlockData() { + } + + @Override + public int size() { + int size = 0; + // length + size += SerializeUtils.sizeOfUint16(); + for (String address : addresses) { + size += SerializeUtils.sizeOfString(address); + } + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.writeUint16(addresses.length); + for (String address : addresses) { + stream.writeString(address); + } + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + int length = byteBuffer.readUint16(); + String[] _addresses = new String[length]; + for (int i = 0; i < length; i++) { + _addresses[i] = byteBuffer.readString(); + } + this.addresses = _addresses; + this.extend = byteBuffer.readByLengthByte(); + } + + public String[] getAddresses() { + return addresses; + } + + public void setAddresses(String[] addresses) { + this.addresses = addresses; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java new file mode 100644 index 0000000000..1e81e288eb --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java @@ -0,0 +1,111 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.bo.tx.txdata; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/3/16 + */ +public class AccountContractCallData extends BaseNulsData { + + private String[] addresses; + + // 1-添加 2-移除 + private int type; + + private byte[] extend; + + public AccountContractCallData() { + } + + @Override + public int size() { + int size = 0; + // length + size += SerializeUtils.sizeOfUint16(); + for (String address : addresses) { + size += SerializeUtils.sizeOfString(address); + } + size += SerializeUtils.sizeOfUint16(); + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.writeUint16(addresses.length); + for (String address : addresses) { + stream.writeString(address); + } + stream.writeUint16(type); + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + int length = byteBuffer.readUint16(); + String[] _addresses = new String[length]; + for (int i = 0; i < length; i++) { + _addresses[i] = byteBuffer.readString(); + } + this.addresses = _addresses; + this.type = byteBuffer.readUint16(); + this.extend = byteBuffer.readByLengthByte(); + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String[] getAddresses() { + return addresses; + } + + public void setAddresses(String[] addresses) { + this.addresses = addresses; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java b/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java new file mode 100644 index 0000000000..61af16258f --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java @@ -0,0 +1,76 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.dto; + + +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.account.model.po.AccountBlockExtendPO; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/23 + */ +public class AccountBlockDTO { + + private byte[] address; + private AccountBlockInfo info; + + public AccountBlockDTO() { + } + + public AccountBlockDTO(byte[] address) { + this.address = address; + } + + public AccountBlockDTO(byte[] address, AccountBlockInfo info) throws NulsException, IOException { + this.address = address; + this.info = info; + } + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public AccountBlockInfo getInfo() { + return info; + } + + public void setInfo(AccountBlockInfo info) { + this.info = info; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java b/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java new file mode 100644 index 0000000000..64fb8fe8bb --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java @@ -0,0 +1,160 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.po; + + +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +public class AccountBlockExtendPO extends BaseNulsData { + + private byte[] address; + + private int[] types; + + private String[] contracts; + + private byte[] extend; + + public AccountBlockExtendPO() { + } + + public AccountBlockExtendPO(byte[] address, AccountBlockInfo info) { + this.address = address; + this.types = info.getTypes(); + this.contracts = info.getContracts(); + this.extend = info.getExtend(); + } + + public AccountBlockExtendPO(byte[] address, int[] types, String[] contracts, byte[] extend) { + this.address = address; + this.types = types; + this.contracts = contracts; + this.extend = extend; + } + + @Override + public int size() { + int size = 0; + size += Address.ADDRESS_LENGTH; + // length + size += SerializeUtils.sizeOfUint16(); + if (types != null) { + size += SerializeUtils.sizeOfUint16() * types.length; + } + size += SerializeUtils.sizeOfUint16(); + if (contracts != null) { + for (String contract : contracts) { + size += SerializeUtils.sizeOfString(contract); + } + } + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(address); + if (types == null) { + stream.writeUint16(0); + } else { + stream.writeUint16(types.length); + for (int type : types) { + stream.writeUint16(type); + } + } + if (contracts == null) { + stream.writeUint16(0); + } else { + stream.writeUint16(contracts.length); + for (String address : contracts) { + stream.writeString(address); + } + } + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.address = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + int length0 = byteBuffer.readUint16(); + int[] _types = new int[length0]; + for (int i = 0; i < length0; i++) { + _types[i] = byteBuffer.readUint16(); + } + int length = byteBuffer.readUint16(); + String[] _addresses = new String[length]; + for (int i = 0; i < length; i++) { + _addresses[i] = byteBuffer.readString(); + } + this.types = _types; + this.contracts = _addresses; + this.extend = byteBuffer.readByLengthByte(); + } + + public int[] getTypes() { + return types; + } + + public void setTypes(int[] types) { + this.types = types; + } + + public String[] getContracts() { + return contracts; + } + + public void setContracts(String[] contracts) { + this.contracts = contracts; + } + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockPO.java b/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockPO.java new file mode 100644 index 0000000000..93cecbee09 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockPO.java @@ -0,0 +1,97 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.po; + + +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +public class AccountBlockPO extends BaseNulsData { + + private byte[] address; + + private byte[] extend; + + public AccountBlockPO() { + } + + public AccountBlockPO(byte[] address) { + this.address = address; + } + + public AccountBlockPO(byte[] address, AccountBlockInfo info) throws IOException { + this.address = address; + AccountBlockExtendPO po = new AccountBlockExtendPO(address, info); + this.extend = po.serialize(); + } + + @Override + public int size() { + int size = 0; + size += Address.ADDRESS_LENGTH; + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(address); + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.address = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + this.extend = byteBuffer.readByLengthByte(); + } + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java b/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java new file mode 100644 index 0000000000..d0f51a1bdd --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java @@ -0,0 +1,90 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.model.po; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/3/16 + */ +public class AccountContractCallPO extends BaseNulsData { + + private byte[] address; + + private byte[] extend; + + public AccountContractCallPO() { + } + + public AccountContractCallPO(byte[] address) { + this.address = address; + } + + @Override + public int size() { + int size = 0; + size += Address.ADDRESS_LENGTH; + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(address); + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.address = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + this.extend = byteBuffer.readByLengthByte(); + } + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java b/module/nuls-account/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java new file mode 100644 index 0000000000..e8bc3ee34b --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java @@ -0,0 +1,59 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.account.model.vo; + +/** + * @author: PierreLuo + * @date: 2022/1/25 + */ +public class AccountBlockVO { + + private String address; + private int[] types; + private String[] contracts; + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public int[] getTypes() { + return types; + } + + public void setTypes(int[] types) { + this.types = types; + } + + public String[] getContracts() { + return contracts; + } + + public void setContracts(String[] contracts) { + this.contracts = contracts; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java b/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java new file mode 100644 index 0000000000..15fbc3ac87 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java @@ -0,0 +1,205 @@ +package io.nuls.account.rpc.cmd; + +import io.nuls.account.constant.AccountConstant; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.constant.RpcParameterNameConstant; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.po.AccountBlockExtendPO; +import io.nuls.account.model.po.AccountBlockPO; +import io.nuls.account.model.vo.AccountBlockVO; +import io.nuls.account.storage.AccountBlockStorageService; +import io.nuls.account.util.manager.ChainManager; +import io.nuls.base.basic.AddressTool; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.exception.NulsRuntimeException; +import io.nuls.core.rpc.cmd.BaseCmd; +import io.nuls.core.rpc.model.*; +import io.nuls.core.rpc.model.message.Response; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static io.nuls.account.util.LoggerUtil.LOG; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +@Component +public class AccountBlockCmd extends BaseCmd { + + @Autowired + private AccountBlockStorageService accountBlockStorageService; + @Autowired + private ChainManager chainManager; + + @CmdAnnotation(cmd = "ac_isBlockAccount", version = 1.0, description = "检查账户是否锁定") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "address", parameterType = "String", parameterDes = "地址") + }) + @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "value", valueType = Boolean.class, description = "账户是否锁定") + })) + public Response isBlockAccount(Map params) { + boolean isBlock; + Chain chain = null; + String address; + Object chainIdObj = params == null ? null : params.get(RpcParameterNameConstant.CHAIN_ID); + Object addressObj = params == null ? null : params.get("address"); + try { + // check parameters + if (params == null || chainIdObj == null || addressObj == null) { + throw new NulsRuntimeException(AccountErrorCode.NULL_PARAMETER); + } + chain = chainManager.getChain((Integer) chainIdObj); + if (null == chain) { + throw new NulsRuntimeException(AccountErrorCode.CHAIN_NOT_EXIST); + } + address = (String) addressObj; + isBlock = accountBlockStorageService.existAccount(AddressTool.getAddress(address)); + } catch (NulsRuntimeException e) { + errorLogProcess(chain, e); + return failed(e.getErrorCode()); + } catch (Exception e) { + errorLogProcess(chain, e); + return failed(AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + Map result = new HashMap<>(AccountConstant.INIT_CAPACITY_2); + result.put("value", isBlock); + return success(result); + } + + @CmdAnnotation(cmd = "ac_getAllBlockAccount", version = 1.0, description = "查询所有锁定账户") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + }) + @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class)) + public Response getAllBlockAccount(Map params) { + Chain chain = null; + Object chainIdObj = params == null ? null : params.get(RpcParameterNameConstant.CHAIN_ID); + try { + // check parameters + if (params == null || chainIdObj == null) { + throw new NulsRuntimeException(AccountErrorCode.NULL_PARAMETER); + } + chain = chainManager.getChain((Integer) chainIdObj); + if (null == chain) { + throw new NulsRuntimeException(AccountErrorCode.CHAIN_NOT_EXIST); + } + List accountList = accountBlockStorageService.getAccountList(); + if (accountList == null) { + accountList = Collections.EMPTY_LIST; + } + List collect = accountList.stream().map(a -> AddressTool.getStringAddressByBytes(a.getAddress())).collect(Collectors.toList()); + Map result = new HashMap<>(AccountConstant.INIT_CAPACITY_2); + result.put("value", collect); + return success(result); + } catch (NulsRuntimeException e) { + errorLogProcess(chain, e); + return failed(e.getErrorCode()); + } catch (Exception e) { + errorLogProcess(chain, e); + return failed(AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + } + + @CmdAnnotation(cmd = "ac_getBlockAccountBytes", version = 1.0, description = "查询锁定账户的信息") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "address", parameterType = "String", parameterDes = "地址") + }) + @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "value", valueType = String.class, description = "锁定账户的序列化字符串") + })) + public Response getBlockAccountBytes(Map params) { + Chain chain = null; + try { + String address; + Object chainIdObj = params == null ? null : params.get(RpcParameterNameConstant.CHAIN_ID); + Object addressObj = params == null ? null : params.get("address"); + // check parameters + if (params == null || chainIdObj == null || addressObj == null) { + throw new NulsRuntimeException(AccountErrorCode.NULL_PARAMETER); + } + chain = chainManager.getChain((Integer) chainIdObj); + if (null == chain) { + throw new NulsRuntimeException(AccountErrorCode.CHAIN_NOT_EXIST); + } + address = (String) addressObj; + byte[] bytes = accountBlockStorageService.getAccountBytes(AddressTool.getAddress(address)); + Map result = new HashMap<>(AccountConstant.INIT_CAPACITY_2); + String resultHex; + if (bytes == null) { + resultHex = ""; + } else { + resultHex = HexUtil.encode(bytes); + } + result.put("value", resultHex); + return success(result); + } catch (NulsRuntimeException e) { + errorLogProcess(chain, e); + return failed(e.getErrorCode()); + } catch (Exception e) { + errorLogProcess(chain, e); + return failed(AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + } + + @CmdAnnotation(cmd = "ac_getBlockAccountInfo", version = 1.0, description = "查询锁定账户的信息") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "address", parameterType = "String", parameterDes = "地址") + }) + @ResponseData(name = "返回值", description = "返回一个对象", responseType = @TypeDescriptor(value = AccountBlockVO.class)) + public Response getBlockAccountInfo(Map params) { + Chain chain = null; + try { + String address; + Object chainIdObj = params == null ? null : params.get(RpcParameterNameConstant.CHAIN_ID); + Object addressObj = params == null ? null : params.get("address"); + // check parameters + if (params == null || chainIdObj == null || addressObj == null) { + throw new NulsRuntimeException(AccountErrorCode.NULL_PARAMETER); + } + chain = chainManager.getChain((Integer) chainIdObj); + if (null == chain) { + throw new NulsRuntimeException(AccountErrorCode.CHAIN_NOT_EXIST); + } + address = (String) addressObj; + AccountBlockPO account = accountBlockStorageService.getAccount(AddressTool.getAddress(address)); + if (account == null) { + return failed(AccountErrorCode.DATA_NOT_FOUND); + } + AccountBlockVO vo = new AccountBlockVO(); + vo.setAddress(AddressTool.getStringAddressByBytes(account.getAddress())); + if (account.getExtend() != null) { + AccountBlockExtendPO extendPO = new AccountBlockExtendPO(); + extendPO.parse(account.getExtend(), 0); + vo.setTypes(extendPO.getTypes()); + vo.setContracts(extendPO.getContracts()); + } + return success(vo); + } catch (NulsRuntimeException e) { + errorLogProcess(chain, e); + return failed(e.getErrorCode()); + } catch (Exception e) { + errorLogProcess(chain, e); + return failed(AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + } + + private void errorLogProcess(Chain chain, Exception e) { + if (chain == null) { + LOG.error(e); + } else { + chain.getLogger().error(e); + } + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java b/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java index 0bc54d66fa..016f9aef58 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java +++ b/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java @@ -10,9 +10,12 @@ import io.nuls.account.model.dto.AccountKeyStoreDTO; import io.nuls.account.model.dto.AccountOfflineDTO; import io.nuls.account.model.dto.SimpleAccountDTO; +import io.nuls.account.model.po.AccountBlockPO; +import io.nuls.account.model.po.AccountContractCallPO; import io.nuls.account.service.AccountKeyStoreService; import io.nuls.account.service.AccountService; import io.nuls.account.service.TransactionService; +import io.nuls.account.storage.AccountForTransferOnContractCallStorageService; import io.nuls.account.util.AccountTool; import io.nuls.account.util.Preconditions; import io.nuls.account.util.manager.ChainManager; @@ -40,10 +43,8 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; import static io.nuls.account.util.LoggerUtil.LOG; @@ -63,6 +64,11 @@ public class AccountCmd extends BaseCmd { private TransactionService transactionService; @Autowired private ChainManager chainManager; + @Autowired + private AccountForTransferOnContractCallStorageService accountForTransferOnContractCallStorageService; + + public AccountCmd() { + } @CmdAnnotation(cmd = "ac_createAccount", version = 1.0, description = "创建指定个数的账户/create a specified number of accounts") @Parameters(value = { @@ -1095,6 +1101,83 @@ public Response validationPassword(Map params) { return success(map); } + @CmdAnnotation(cmd = "ac_validationWhitelistForTransferOnContractCall", version = 1.0, description = "验证账户是否在合约白名单中") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "address", parameterType = "String", parameterDes = "账户地址") + }) + @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = RpcConstant.VALUE, valueType = boolean.class, description = "账户是否在合约白名单中") + })) + public Response validationWhitelistForTransferOnContractCall(Map params) { + Map map = new HashMap<>(AccountConstant.INIT_CAPACITY_2); + Chain chain = null; + try { + // check parameters + Preconditions.checkNotNull(params, AccountErrorCode.NULL_PARAMETER); + Object chainIdObj = params.get(RpcParameterNameConstant.CHAIN_ID); + Object addressObj = params.get(RpcParameterNameConstant.ADDRESS); + if (chainIdObj == null || addressObj == null) { + throw new NulsRuntimeException(AccountErrorCode.NULL_PARAMETER); + } + + // parse params + //链ID + int chainId = (int) chainIdObj; + chain = chainManager.getChain((Integer) chainIdObj); + if (null == chain) { + throw new NulsRuntimeException(AccountErrorCode.CHAIN_NOT_EXIST); + } + //账户地址 + String address = (String) addressObj; + + //check the account + boolean result = accountService.validationWhitelistForTransferOnContractCall(chainId, address); + map.put(RpcConstant.VALUE, result); + } catch (NulsRuntimeException e) { + errorLogProcess(chain, e); + return failed(e.getErrorCode()); + } catch (Exception e) { + errorLogProcess(chain, e); + return failed(AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + return success(map); + } + + @CmdAnnotation(cmd = "ac_getAllContractCallAccount", version = 1.0, description = "查询调用合约允许普通转账的账户白名单") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + }) + @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class)) + public Response getAllContractCallAccount(Map params) { + Chain chain = null; + Object chainIdObj = params == null ? null : params.get(RpcParameterNameConstant.CHAIN_ID); + try { + // check parameters + if (params == null || chainIdObj == null) { + throw new NulsRuntimeException(AccountErrorCode.NULL_PARAMETER); + } + chain = chainManager.getChain((Integer) chainIdObj); + if (null == chain) { + throw new NulsRuntimeException(AccountErrorCode.CHAIN_NOT_EXIST); + } + List accountList = accountForTransferOnContractCallStorageService.getAccountList(); + if (accountList == null) { + accountList = Collections.EMPTY_LIST; + } + List collect = accountList.stream().map(a -> AddressTool.getStringAddressByBytes(a.getAddress())).collect(Collectors.toList()); + Map result = new HashMap<>(AccountConstant.INIT_CAPACITY_2); + result.put("value", collect); + return success(result); + } catch (NulsRuntimeException e) { + errorLogProcess(chain, e); + return failed(e.getErrorCode()); + } catch (Exception e) { + errorLogProcess(chain, e); + return failed(AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + } + /** * 数据摘要签名 * data digest signature diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/AccountService.java b/module/nuls-account/src/main/java/io/nuls/account/service/AccountService.java index a0dacd797e..1fcdc7831b 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/service/AccountService.java +++ b/module/nuls-account/src/main/java/io/nuls/account/service/AccountService.java @@ -65,6 +65,14 @@ public interface AccountService { */ Account getAccount(int chainId, String address); + /** + * 账户是否在合约白名单中 + * @param chainId + * @param address + * @return + */ + boolean validationWhitelistForTransferOnContractCall(int chainId, String address); + /** * 获取所有账户集合,并放入缓存 * Query all account collections and put them in cache. diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java b/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java index 6e35ed5d3c..61198ff1f1 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java +++ b/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java @@ -38,6 +38,7 @@ import io.nuls.account.service.AccountKeyStoreService; import io.nuls.account.service.AccountService; import io.nuls.account.service.AliasService; +import io.nuls.account.storage.AccountForTransferOnContractCallStorageService; import io.nuls.account.storage.AccountStorageService; import io.nuls.account.util.AccountTool; import io.nuls.account.util.LoggerUtil; @@ -83,6 +84,8 @@ public class AccountServiceImpl implements AccountService { @Autowired private AccountKeyStoreService keyStoreService; + @Autowired + private AccountForTransferOnContractCallStorageService accountForTransferOnContractCallStorageService; private AccountCacheService accountCacheService = AccountCacheService.getInstance(); @@ -147,6 +150,16 @@ public Account getAccount(int chainId, String address) { return account; } + @Override + public boolean validationWhitelistForTransferOnContractCall(int chainId, String address) { + //check params + if (!AddressTool.validAddress(chainId, address)) { + throw new NulsRuntimeException(AccountErrorCode.ADDRESS_ERROR); + } + //check the account + return accountForTransferOnContractCallStorageService.exist(AddressTool.getAddress(address)); + } + @Override public List getAccountList() { List list = new ArrayList<>(); diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java b/module/nuls-account/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java new file mode 100644 index 0000000000..7954d54979 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java @@ -0,0 +1,48 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.storage; + +import io.nuls.account.model.dto.AccountBlockDTO; +import io.nuls.account.model.po.AccountBlockPO; + +import java.util.List; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +public interface AccountBlockStorageService { + + boolean operateAccountList(List accountList) throws Exception; + boolean cancelOperateAccountList(List accountList)throws Exception; + boolean saveAccountList(List accountList); + boolean removeAccountList(List accountList); + List getAccountList(); + AccountBlockPO getAccount(byte[] address); + byte[] getAccountBytes(byte[] address); + boolean existAccount(byte[] address); + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java b/module/nuls-account/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java new file mode 100644 index 0000000000..c3d4720f1b --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java @@ -0,0 +1,51 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.storage; + +import io.nuls.account.model.po.AccountContractCallPO; +import io.nuls.account.model.po.AccountPO; +import io.nuls.base.data.Address; + +import java.util.List; + +/** + * 调用合约允许普通转账的账户白名单 + * @author: PierreLuo + * @date: 2022/3/16 + */ +public interface AccountForTransferOnContractCallStorageService { + + boolean saveAccountList(List accountPOList); + + boolean removeAccount(List address); + + List getAccountList(); + + AccountContractCallPO getAccount(byte[] address); + + boolean exist(byte[] address); + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java b/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java new file mode 100644 index 0000000000..00d6c6125e --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java @@ -0,0 +1,288 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.storage.impl; + +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.constant.AccountStorageConstant; +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.account.model.dto.AccountBlockDTO; +import io.nuls.account.model.po.AccountBlockExtendPO; +import io.nuls.account.model.po.AccountBlockPO; +import io.nuls.account.storage.AccountBlockStorageService; +import io.nuls.account.util.LoggerUtil; +import io.nuls.base.basic.AddressTool; +import io.nuls.core.basic.InitializingBean; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsRuntimeException; +import io.nuls.core.rockdb.service.RocksDBService; + +import java.io.IOException; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author: qinyifeng + */ +@Component +public class AccountBlockStorageServiceImpl implements AccountBlockStorageService, InitializingBean { + + @Override + public void afterPropertiesSet() { + } + + private Set intArray2set(int[] _array) { + Set result = new HashSet<>(); + for (int a : _array) { + result.add(Integer.valueOf(a)); + } + return result; + } + + private int[] set2intArray(Set set) { + int[] result = new int[set.size()]; + int i = 0; + for (Integer s : set) { + result[i++] = s.intValue(); + } + return result; + } + + @Override + public boolean operateAccountList(List accountList) throws Exception { + if (null == accountList || accountList.size() == 0) { + throw new NulsRuntimeException(AccountErrorCode.PARAMETER_ERROR); + } + List poList = new ArrayList<>(); + for (AccountBlockDTO dto : accountList) { + byte[] address = dto.getAddress(); + AccountBlockInfo info = dto.getInfo(); + if (info == null) { + // 账户完全锁定 + poList.add(new AccountBlockPO(address)); + } else { + AccountBlockPO po = this.getAccount(address); + if (po == null) { + // 首次添加白名单 + poList.add(new AccountBlockPO(address, info)); + } else if (po.getExtend() == null) { + // 首次添加白名单 + po.setExtend(new AccountBlockExtendPO(address, info).serialize()); + poList.add(po); + } else { + // 更新白名单 + AccountBlockExtendPO extendPO = new AccountBlockExtendPO(); + extendPO.parse(po.getExtend(), 0); + int[] types = extendPO.getTypes(); + String[] contracts = extendPO.getContracts(); + int operationType = info.getOperationType(); + if (operationType == 1) { + // 添加白名单 + int[] _types = info.getTypes(); + if (_types != null) { + Set typeSet = types == null ? new HashSet<>() : this.intArray2set(types); + typeSet.addAll(this.intArray2set(_types)); + extendPO.setTypes(this.set2intArray(typeSet)); + } + String[] _contracts = info.getContracts(); + if (_contracts != null) { + Set contractSet = contracts == null ? new HashSet<>() : new HashSet<>(Arrays.asList(contracts)); + contractSet.addAll(Arrays.asList(_contracts)); + extendPO.setContracts(contractSet.toArray(new String[contractSet.size()])); + } + po.setExtend(extendPO.serialize()); + poList.add(po); + } else if (operationType == 2) { + // 移除白名单 + int[] _types = info.getTypes(); + if (_types != null) { + Set typeSet = types == null ? new HashSet<>() : this.intArray2set(types); + typeSet.removeAll(this.intArray2set(_types)); + extendPO.setTypes(this.set2intArray(typeSet)); + } + String[] _contracts = info.getContracts(); + if (_contracts != null) { + Set contractSet = contracts == null ? new HashSet<>() : new HashSet<>(Arrays.asList(contracts)); + contractSet.removeAll(Arrays.asList(_contracts)); + extendPO.setContracts(contractSet.toArray(new String[contractSet.size()])); + } + po.setExtend(extendPO.serialize()); + poList.add(po); + } + } + } + } + return this.saveAccountList(poList); + } + + @Override + public boolean cancelOperateAccountList(List accountList) throws Exception { + if (null == accountList || accountList.size() == 0) { + throw new NulsRuntimeException(AccountErrorCode.PARAMETER_ERROR); + } + List accountRemoveList = new ArrayList<>(); + List poList = new ArrayList<>(); + for (AccountBlockDTO dto : accountList) { + byte[] address = dto.getAddress(); + AccountBlockInfo info = dto.getInfo(); + if (info == null) { + // 取消账户完全锁定 + accountRemoveList.add(address); + } else { + AccountBlockPO po = this.getAccount(address); + if (po == null) { + continue; + } + // 取消更新白名单 + AccountBlockExtendPO extendPO = new AccountBlockExtendPO(); + extendPO.parse(po.getExtend(), 0); + int[] types = extendPO.getTypes(); + String[] contracts = extendPO.getContracts(); + int operationType = info.getOperationType(); + if (operationType == 1) { + // 取消添加白名单 + int[] _types = info.getTypes(); + if (_types != null) { + Set typeSet = types == null ? new HashSet<>() : this.intArray2set(types); + typeSet.removeAll(this.intArray2set(_types)); + extendPO.setTypes(this.set2intArray(typeSet)); + } + String[] _contracts = info.getContracts(); + if (_contracts != null) { + Set contractSet = contracts == null ? new HashSet<>() : new HashSet<>(Arrays.asList(contracts)); + contractSet.removeAll(Arrays.asList(_contracts)); + extendPO.setContracts(contractSet.toArray(new String[contractSet.size()])); + } + po.setExtend(extendPO.serialize()); + poList.add(po); + } else if (operationType == 2) { + // 取消移除白名单 + int[] _types = info.getTypes(); + if (_types != null) { + Set typeSet = types == null ? new HashSet<>() : this.intArray2set(types); + typeSet.addAll(this.intArray2set(_types)); + extendPO.setTypes(this.set2intArray(typeSet)); + } + String[] _contracts = info.getContracts(); + if (_contracts != null) { + Set contractSet = contracts == null ? new HashSet<>() : new HashSet<>(Arrays.asList(contracts)); + contractSet.addAll(Arrays.asList(_contracts)); + extendPO.setContracts(contractSet.toArray(new String[contractSet.size()])); + } + po.setExtend(extendPO.serialize()); + poList.add(po); + } + } + } + if (!accountRemoveList.isEmpty()) { + RocksDBService.deleteKeys(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK, accountRemoveList); + } + return this.saveAccountList(poList); + } + + @Override + public boolean saveAccountList(List accountPOList) { + if (null == accountPOList || accountPOList.size() == 0) { + throw new NulsRuntimeException(AccountErrorCode.PARAMETER_ERROR); + } + Map accountPoMap = new HashMap<>(); + try { + for (AccountBlockPO po : accountPOList) { + //序列化对象为byte数组存储 + accountPoMap.put(po.getAddress(), po.serialize()); + } + return RocksDBService.batchPut(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK, accountPoMap); + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_SAVE_BATCH_ERROR); + } + } + @Override + public boolean removeAccountList(List accountList) { + if (null == accountList || accountList.isEmpty()) { + throw new NulsRuntimeException(AccountErrorCode.PARAMETER_ERROR); + } + try { + List addressBytesList = accountList.stream().map(a -> AddressTool.getAddress(a)).collect(Collectors.toList()); + return RocksDBService.deleteKeys(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK, addressBytesList); + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_DELETE_ERROR); + } + } + @Override + public List getAccountList() { + List accountPOList = new ArrayList<>(); + try { + List list = RocksDBService.valueList(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK); + if (list != null) { + for (byte[] value : list) { + AccountBlockPO accountPo = new AccountBlockPO(); + //将byte数组反序列化为AccountPo返回 + accountPo.parse(value, 0); + accountPOList.add(accountPo); + } + } + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_QUERY_ERROR); + } + return accountPOList; + } + @Override + public AccountBlockPO getAccount(byte[] address) { + byte[] accountBytes = RocksDBService.get(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK, address); + if (null == accountBytes) { + return null; + } + AccountBlockPO accountPo = new AccountBlockPO(); + try { + //将byte数组反序列化为AccountPo返回 + accountPo.parse(accountBytes, 0); + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_QUERY_ERROR); + } + return accountPo; + } + @Override + public byte[] getAccountBytes(byte[] address) { + byte[] accountBytes = RocksDBService.get(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK, address); + if (null == accountBytes) { + return null; + } + return accountBytes; + } + + @Override + public boolean existAccount(byte[] address) { + byte[] accountBytes = RocksDBService.get(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK, address); + if (null == accountBytes) { + return false; + } + return true; + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java b/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java new file mode 100644 index 0000000000..7222fcd685 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java @@ -0,0 +1,127 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.account.storage.impl; + +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.constant.AccountStorageConstant; +import io.nuls.account.model.po.AccountContractCallPO; +import io.nuls.account.storage.AccountForTransferOnContractCallStorageService; +import io.nuls.account.util.LoggerUtil; +import io.nuls.base.data.Address; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsRuntimeException; +import io.nuls.core.rockdb.service.RocksDBService; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author: PierreLuo + * @date: 2022/3/16 + */ +@Component +public class AccountForTransferOnContractCallStorageServiceImpl implements AccountForTransferOnContractCallStorageService { + + + @Override + public boolean saveAccountList(List accountPOList) { + if (null == accountPOList || accountPOList.size() == 0) { + throw new NulsRuntimeException(AccountErrorCode.PARAMETER_ERROR); + } + Map accountPoMap = new HashMap<>(); + try { + for (AccountContractCallPO po : accountPOList) { + //序列化对象为byte数组存储 + accountPoMap.put(po.getAddress(), po.serialize()); + } + return RocksDBService.batchPut(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL, accountPoMap); + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_SAVE_BATCH_ERROR); + } + } + + @Override + public boolean removeAccount(List addresses) { + if (null == addresses || addresses.size() <= 0) { + throw new NulsRuntimeException(AccountErrorCode.PARAMETER_ERROR); + } + try { + return RocksDBService.deleteKeys(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL, addresses); + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_SAVE_ERROR); + } + } + + @Override + public List getAccountList() { + List accountPOList = new ArrayList<>(); + try { + List list = RocksDBService.valueList(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL); + if (list != null) { + for (byte[] value : list) { + AccountContractCallPO accountPo = new AccountContractCallPO(); + //将byte数组反序列化为AccountPo返回 + accountPo.parse(value, 0); + accountPOList.add(accountPo); + } + } + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_QUERY_ERROR); + } + return accountPOList; + } + + @Override + public AccountContractCallPO getAccount(byte[] address) { + byte[] accountBytes = RocksDBService.get(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL, address); + if (null == accountBytes) { + return null; + } + AccountContractCallPO accountPo = new AccountContractCallPO(); + try { + //将byte数组反序列化为AccountPo返回 + accountPo.parse(accountBytes, 0); + } catch (Exception e) { + LoggerUtil.LOG.error(e.getMessage()); + throw new NulsRuntimeException(AccountErrorCode.DB_QUERY_ERROR); + } + return accountPo; + } + + @Override + public boolean exist(byte[] address) { + byte[] accountBytes = RocksDBService.get(AccountStorageConstant.DB_NAME_ACCOUNT_CONTRACT_CALL, address); + if (null == accountBytes) { + return false; + } + return true; + } +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java b/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java new file mode 100644 index 0000000000..e0d9288d48 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java @@ -0,0 +1,187 @@ +package io.nuls.account.tx.v11; + +import io.nuls.account.constant.AccountConstant; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.helper.AccountBlockHelper; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.tx.txdata.AccountBlockData; +import io.nuls.account.model.po.AccountBlockPO; +import io.nuls.account.service.AliasService; +import io.nuls.account.storage.AccountBlockStorageService; +import io.nuls.account.util.LoggerUtil; +import io.nuls.account.util.manager.ChainManager; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.*; +import java.util.stream.Collectors; + +import static io.nuls.account.util.LoggerUtil.LOG; + +@Component("AccountLockProcessorV11") +public class AccountLockProcessorV11 implements TransactionProcessor { + + @Autowired + private ChainManager chainManager; + @Autowired + private AliasService aliasService; + @Autowired + private AccountBlockHelper accountBlockHelper; + @Autowired + private AccountBlockStorageService accountBlockStorageService; + + @Override + public int getType() { + return TxType.BLOCK_ACCOUNT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + Map result = null; + Chain chain = null; + try { + chain = chainManager.getChain(chainId); + result = new HashMap<>(AccountConstant.INIT_CAPACITY_4); + String errorCode = null; + if (chain == null) { + errorCode = AccountErrorCode.CHAIN_NOT_EXIST.getCode(); + chain.getLogger().error("chain is not exist, -chainId:{}", chainId); + result.put("txList", txs); + result.put("errorCode", errorCode); + return result; + } + List txList = new ArrayList<>(); + for (Transaction tx : txs) { + try { + Result rs = accountBlockHelper.blockAccountTxValidate(chain, tx); + if (rs.isFailed()) { + errorCode = rs.getErrorCode().getCode(); + txList.add(tx); + } + } catch (Exception e) { + chain.getLogger().error(e); + if (e instanceof NulsException) { + errorCode = ((NulsException)e).getErrorCode().getCode(); + } else { + errorCode = AccountErrorCode.DATA_ERROR.getCode(); + } + txList.add(tx); + } + } + result.put("txList", txList); + result.put("errorCode", errorCode); + } catch (Exception e) { + errorLogProcess(chain, e); + result.put("txList", txs); + result.put("errorCode", AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List commitSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountBlockData data = new AccountBlockData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List poList = Arrays.asList(addresses).stream().map(a -> new AccountBlockPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + result = accountBlockStorageService.saveAccountList(poList); + } catch (NulsException e) { + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("ac_commitTx block_account tx commit error"); + break; + } + commitSucTxList.add(tx); + } + try { + //如果提交失败，将已经提交成功的交易回滚 + if (!result) { + boolean rollback = true; + for (Transaction tx : commitSucTxList) { + AccountBlockData data = new AccountBlockData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + rollback = accountBlockStorageService.removeAccountList(Arrays.asList(addresses)); + } + //回滚失败，抛异常 + if (!rollback) { + LoggerUtil.LOG.error("ac_commitTx block_account tx rollback error"); + throw new NulsException(AccountErrorCode.ALIAS_ROLLBACK_ERROR); + } + } + } catch (Exception e) { + errorLogProcess(chain, e); + result = false; + } + + return result; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List rollbackSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountBlockData data = new AccountBlockData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + result = accountBlockStorageService.removeAccountList(Arrays.asList(addresses)); + } catch (NulsException e) { + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("ac_rollbackTx block_account tx rollback error"); + break; + } + rollbackSucTxList.add(tx); + } + //交易提交 + try { + //如果回滚失败，将已经回滚成功的交易重新保存 + if (!result) { + boolean commit = true; + for (Transaction tx : rollbackSucTxList) { + AccountBlockData data = new AccountBlockData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List poList = Arrays.asList(addresses).stream().map(a -> new AccountBlockPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + commit = accountBlockStorageService.saveAccountList(poList); + } + //保存失败，抛异常 + if (!commit) { + LoggerUtil.LOG.error("ac_rollbackTx block_account tx commit error"); + throw new NulsException(AccountErrorCode.ALIAS_SAVE_ERROR); + } + } + } catch (NulsException e) { + errorLogProcess(chain, e); + result = false; + } + return result; + } + + private void errorLogProcess(Chain chain, Exception e) { + if (chain == null) { + LOG.error(e); + } else { + chain.getLogger().error(e); + } + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java b/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java new file mode 100644 index 0000000000..0599a3cd73 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java @@ -0,0 +1,187 @@ +package io.nuls.account.tx.v11; + +import io.nuls.account.constant.AccountConstant; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.helper.AccountBlockHelper; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.tx.txdata.AccountBlockData; +import io.nuls.account.model.po.AccountBlockPO; +import io.nuls.account.service.AliasService; +import io.nuls.account.storage.AccountBlockStorageService; +import io.nuls.account.util.LoggerUtil; +import io.nuls.account.util.manager.ChainManager; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.*; +import java.util.stream.Collectors; + +import static io.nuls.account.util.LoggerUtil.LOG; + +@Component("AccountUnlockProcessorV11") +public class AccountUnlockProcessorV11 implements TransactionProcessor { + + @Autowired + private ChainManager chainManager; + @Autowired + private AliasService aliasService; + @Autowired + private AccountBlockHelper accountBlockHelper; + @Autowired + private AccountBlockStorageService accountBlockStorageService; + + @Override + public int getType() { + return TxType.UNBLOCK_ACCOUNT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + Map result = null; + Chain chain = null; + try { + chain = chainManager.getChain(chainId); + result = new HashMap<>(AccountConstant.INIT_CAPACITY_4); + String errorCode = null; + if (chain == null) { + errorCode = AccountErrorCode.CHAIN_NOT_EXIST.getCode(); + chain.getLogger().error("chain is not exist, -chainId:{}", chainId); + result.put("txList", txs); + result.put("errorCode", errorCode); + return result; + } + List txList = new ArrayList<>(); + for (Transaction tx : txs) { + try { + Result rs = accountBlockHelper.blockAccountTxValidate(chain, tx); + if (rs.isFailed()) { + errorCode = rs.getErrorCode().getCode(); + txList.add(tx); + } + } catch (Exception e) { + chain.getLogger().error(e); + if (e instanceof NulsException) { + errorCode = ((NulsException)e).getErrorCode().getCode(); + } else { + errorCode = AccountErrorCode.DATA_ERROR.getCode(); + } + txList.add(tx); + } + } + result.put("txList", txList); + result.put("errorCode", errorCode); + } catch (Exception e) { + errorLogProcess(chain, e); + result.put("txList", txs); + result.put("errorCode", AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List commitSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountBlockData data = new AccountBlockData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + result = accountBlockStorageService.removeAccountList(Arrays.asList(addresses)); + } catch (NulsException e) { + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("ac_commitTx un_block_account tx commit error"); + break; + } + commitSucTxList.add(tx); + } + try { + //如果提交失败，将已经提交成功的交易回滚 + if (!result) { + boolean rollback = true; + for (Transaction tx : commitSucTxList) { + AccountBlockData data = new AccountBlockData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List poList = Arrays.asList(addresses).stream().map(a -> new AccountBlockPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + rollback = accountBlockStorageService.saveAccountList(poList); + } + //回滚失败，抛异常 + if (!rollback) { + LoggerUtil.LOG.error("ac_commitTx un_block_account tx rollback error"); + throw new NulsException(AccountErrorCode.ALIAS_ROLLBACK_ERROR); + } + } + } catch (Exception e) { + errorLogProcess(chain, e); + result = false; + } + + return result; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List rollbackSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountBlockData data = new AccountBlockData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List poList = Arrays.asList(addresses).stream().map(a -> new AccountBlockPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + result = accountBlockStorageService.saveAccountList(poList); + } catch (NulsException e) { + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("ac_rollbackTx un_block_account tx rollback error"); + break; + } + rollbackSucTxList.add(tx); + } + //交易提交 + try { + //如果回滚失败，将已经回滚成功的交易重新保存 + if (!result) { + boolean commit = true; + for (Transaction tx : rollbackSucTxList) { + AccountBlockData data = new AccountBlockData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + commit = accountBlockStorageService.removeAccountList(Arrays.asList(addresses)); + } + //保存失败，抛异常 + if (!commit) { + LoggerUtil.LOG.error("ac_rollbackTx un_block_account tx commit error"); + throw new NulsException(AccountErrorCode.ALIAS_SAVE_ERROR); + } + } + } catch (NulsException e) { + errorLogProcess(chain, e); + result = false; + } + return result; + } + + private void errorLogProcess(Chain chain, Exception e) { + if (chain == null) { + LOG.error(e); + } else { + chain.getLogger().error(e); + } + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java b/module/nuls-account/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java new file mode 100644 index 0000000000..08c284c5cb --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java @@ -0,0 +1,234 @@ +package io.nuls.account.tx.v12; + +import io.nuls.account.constant.AccountConstant; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.helper.AccountBlockHelper; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.tx.AccountBlockExtend; +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.account.model.bo.tx.txdata.AccountBlockData; +import io.nuls.account.model.dto.AccountBlockDTO; +import io.nuls.account.model.po.AccountBlockPO; +import io.nuls.account.service.AliasService; +import io.nuls.account.storage.AccountBlockStorageService; +import io.nuls.account.util.LoggerUtil; +import io.nuls.account.util.manager.ChainManager; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.*; +import java.util.stream.Collectors; + +import static io.nuls.account.util.LoggerUtil.LOG; + +@Component("AccountLockProcessorV12") +public class AccountLockProcessorV12 implements TransactionProcessor { + + @Autowired + private ChainManager chainManager; + @Autowired + private AliasService aliasService; + @Autowired + private AccountBlockHelper accountBlockHelper; + @Autowired + private AccountBlockStorageService accountBlockStorageService; + + @Override + public int getType() { + return TxType.BLOCK_ACCOUNT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + Map result = null; + Chain chain = null; + try { + chain = chainManager.getChain(chainId); + result = new HashMap<>(AccountConstant.INIT_CAPACITY_4); + String errorCode = null; + if (chain == null) { + errorCode = AccountErrorCode.CHAIN_NOT_EXIST.getCode(); + chain.getLogger().error("chain is not exist, -chainId:{}", chainId); + result.put("txList", txs); + result.put("errorCode", errorCode); + return result; + } + List txList = new ArrayList<>(); + for (Transaction tx : txs) { + try { + Result rs = accountBlockHelper.blockAccountTxValidate(chain, tx); + if (rs.isFailed()) { + errorCode = rs.getErrorCode().getCode(); + txList.add(tx); + } + } catch (Exception e) { + chain.getLogger().error(e); + if (e instanceof NulsException) { + errorCode = ((NulsException)e).getErrorCode().getCode(); + } else { + errorCode = AccountErrorCode.DATA_ERROR.getCode(); + } + txList.add(tx); + } + } + result.put("txList", txList); + result.put("errorCode", errorCode); + } catch (Exception e) { + errorLogProcess(chain, e); + result.put("txList", txs); + result.put("errorCode", AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List commitSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountBlockData data = new AccountBlockData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List list = Arrays.asList(addresses).stream().map(a -> new AccountBlockDTO(AddressTool.getAddress(a))).collect(Collectors.toList()); + byte[] extend = data.getExtend(); + if (extend != null) { + AccountBlockExtend abExtend = new AccountBlockExtend(); + abExtend.parse(extend, 0); + AccountBlockInfo[] infos = abExtend.getInfos(); + int i = 0; + for (AccountBlockDTO dto : list) { + dto.setInfo(infos[i++]); + } + } + result = accountBlockStorageService.operateAccountList(list); + } catch (Exception e) { + LoggerUtil.LOG.error("ac_commitTx block_account tx commit error", e); + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("ac_commitTx block_account tx commit error"); + break; + } + commitSucTxList.add(tx); + } + try { + //如果提交失败，将已经提交成功的交易回滚 + if (!result) { + boolean rollback = true; + for (Transaction tx : commitSucTxList) { + AccountBlockData data = new AccountBlockData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List list = Arrays.asList(addresses).stream().map(a -> new AccountBlockDTO(AddressTool.getAddress(a))).collect(Collectors.toList()); + byte[] extend = data.getExtend(); + if (extend != null) { + AccountBlockExtend abExtend = new AccountBlockExtend(); + abExtend.parse(extend, 0); + AccountBlockInfo[] infos = abExtend.getInfos(); + int i = 0; + for (AccountBlockDTO dto : list) { + dto.setInfo(infos[i++]); + } + } + rollback = accountBlockStorageService.cancelOperateAccountList(list); + } + //回滚失败，抛异常 + if (!rollback) { + LoggerUtil.LOG.error("ac_commitTx block_account tx rollback error"); + throw new NulsException(AccountErrorCode.ALIAS_ROLLBACK_ERROR); + } + } + } catch (Exception e) { + errorLogProcess(chain, e); + result = false; + } + + return result; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List rollbackSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountBlockData data = new AccountBlockData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List list = Arrays.asList(addresses).stream().map(a -> new AccountBlockDTO(AddressTool.getAddress(a))).collect(Collectors.toList()); + byte[] extend = data.getExtend(); + if (extend != null) { + AccountBlockExtend abExtend = new AccountBlockExtend(); + abExtend.parse(extend, 0); + AccountBlockInfo[] infos = abExtend.getInfos(); + int i = 0; + for (AccountBlockDTO dto : list) { + dto.setInfo(infos[i++]); + } + } + result = accountBlockStorageService.cancelOperateAccountList(list); + } catch (Exception e) { + LoggerUtil.LOG.error("ac_rollbackTx block_account tx rollback error", e); + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("ac_rollbackTx block_account tx rollback error"); + break; + } + rollbackSucTxList.add(tx); + } + //交易提交 + try { + //如果回滚失败，将已经回滚成功的交易重新保存 + if (!result) { + boolean commit = true; + for (Transaction tx : rollbackSucTxList) { + AccountBlockData data = new AccountBlockData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + List list = Arrays.asList(addresses).stream().map(a -> new AccountBlockDTO(AddressTool.getAddress(a))).collect(Collectors.toList()); + byte[] extend = data.getExtend(); + if (extend != null) { + AccountBlockExtend abExtend = new AccountBlockExtend(); + abExtend.parse(extend, 0); + AccountBlockInfo[] infos = abExtend.getInfos(); + int i = 0; + for (AccountBlockDTO dto : list) { + dto.setInfo(infos[i++]); + } + } + commit = accountBlockStorageService.operateAccountList(list); + } + //保存失败，抛异常 + if (!commit) { + LoggerUtil.LOG.error("ac_rollbackTx block_account tx commit error"); + throw new NulsException(AccountErrorCode.ALIAS_SAVE_ERROR); + } + } + } catch (Exception e) { + errorLogProcess(chain, e); + result = false; + } + return result; + } + + private void errorLogProcess(Chain chain, Exception e) { + if (chain == null) { + LOG.error(e); + } else { + chain.getLogger().error(e); + } + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java b/module/nuls-account/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java new file mode 100644 index 0000000000..4d1e2c1cb2 --- /dev/null +++ b/module/nuls-account/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java @@ -0,0 +1,217 @@ +package io.nuls.account.tx.v13; + +import io.nuls.account.constant.AccountConstant; +import io.nuls.account.constant.AccountErrorCode; +import io.nuls.account.helper.AccountContractCallHelper; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.tx.txdata.AccountContractCallData; +import io.nuls.account.model.po.AccountContractCallPO; +import io.nuls.account.storage.AccountForTransferOnContractCallStorageService; +import io.nuls.account.util.LoggerUtil; +import io.nuls.account.util.manager.ChainManager; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.*; +import java.util.stream.Collectors; + +import static io.nuls.account.util.LoggerUtil.LOG; + +@Component("AccountForTransferOnContractCallProcessorV13") +public class AccountForTransferOnContractCallProcessorV13 implements TransactionProcessor { + + @Autowired + private ChainManager chainManager; + @Autowired + private AccountContractCallHelper accountContractCallHelper; + @Autowired + private AccountForTransferOnContractCallStorageService accountForTransferOnContractCallStorageService; + + @Override + public int getType() { + return TxType.ACCOUNT_FOR_TRANSFER_ON_CONTRACT_CALL; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + Map result = null; + Chain chain = null; + try { + chain = chainManager.getChain(chainId); + result = new HashMap<>(AccountConstant.INIT_CAPACITY_4); + String errorCode = null; + if (chain == null) { + errorCode = AccountErrorCode.CHAIN_NOT_EXIST.getCode(); + chain.getLogger().error("chain is not exist, -chainId:{}", chainId); + result.put("txList", txs); + result.put("errorCode", errorCode); + return result; + } + List txList = new ArrayList<>(); + for (Transaction tx : txs) { + try { + Result rs = accountContractCallHelper.validate(chain, tx); + if (rs.isFailed()) { + errorCode = rs.getErrorCode().getCode(); + txList.add(tx); + } + } catch (Exception e) { + chain.getLogger().error(e); + if (e instanceof NulsException) { + errorCode = ((NulsException)e).getErrorCode().getCode(); + } else { + errorCode = AccountErrorCode.DATA_ERROR.getCode(); + } + txList.add(tx); + } + } + result.put("txList", txList); + result.put("errorCode", errorCode); + } catch (Exception e) { + errorLogProcess(chain, e); + result.put("txList", txs); + result.put("errorCode", AccountErrorCode.SYS_UNKOWN_EXCEPTION); + } + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List commitSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountContractCallData data = new AccountContractCallData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + int type = data.getType(); + if (type == 1) { + // 添加白名单 + List list = Arrays.asList(addresses).stream().map(a -> new AccountContractCallPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + result = accountForTransferOnContractCallStorageService.saveAccountList(list); + } else { + // type=2, 移除白名单 + List list = Arrays.asList(addresses).stream().map(a -> AddressTool.getAddress(a)).collect(Collectors.toList()); + result = accountForTransferOnContractCallStorageService.removeAccount(list); + } + } catch (Exception e) { + LoggerUtil.LOG.error("AccountForTransferOnContractCall tx commit error", e); + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("AccountForTransferOnContractCall tx commit error"); + break; + } + commitSucTxList.add(tx); + } + try { + //如果提交失败，将已经提交成功的交易回滚 + if (!result) { + boolean rollback = true; + for (Transaction tx : commitSucTxList) { + AccountContractCallData data = new AccountContractCallData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + int type = data.getType(); + if (type == 1) { + List list = Arrays.asList(addresses).stream().map(a -> AddressTool.getAddress(a)).collect(Collectors.toList()); + rollback = accountForTransferOnContractCallStorageService.removeAccount(list); + } else { + List list = Arrays.asList(addresses).stream().map(a -> new AccountContractCallPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + rollback = accountForTransferOnContractCallStorageService.saveAccountList(list); + } + + } + //回滚失败，抛异常 + if (!rollback) { + LoggerUtil.LOG.error("AccountForTransferOnContractCall tx rollback error"); + throw new NulsException(AccountErrorCode.ALIAS_ROLLBACK_ERROR); + } + } + } catch (Exception e) { + errorLogProcess(chain, e); + result = false; + } + + return result; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + boolean result = true; + Chain chain = chainManager.getChain(chainId); + List rollbackSucTxList = new ArrayList<>(); + for (Transaction tx : txs) { + AccountContractCallData data = new AccountContractCallData(); + try { + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + int type = data.getType(); + if (type == 1) { + List list = Arrays.asList(addresses).stream().map(a -> AddressTool.getAddress(a)).collect(Collectors.toList()); + result = accountForTransferOnContractCallStorageService.removeAccount(list); + } else { + List list = Arrays.asList(addresses).stream().map(a -> new AccountContractCallPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + result = accountForTransferOnContractCallStorageService.saveAccountList(list); + } + + } catch (Exception e) { + LoggerUtil.LOG.error("AccountForTransferOnContractCall tx rollback error", e); + result = false; + } + if (!result) { + LoggerUtil.LOG.warn("AccountForTransferOnContractCall tx rollback error"); + break; + } + rollbackSucTxList.add(tx); + } + //交易提交 + try { + //如果回滚失败，将已经回滚成功的交易重新保存 + if (!result) { + boolean commit = true; + for (Transaction tx : rollbackSucTxList) { + AccountContractCallData data = new AccountContractCallData(); + data.parse(new NulsByteBuffer(tx.getTxData())); + String[] addresses = data.getAddresses(); + int type = data.getType(); + if (type == 1) { + List list = Arrays.asList(addresses).stream().map(a -> new AccountContractCallPO(AddressTool.getAddress(a))).collect(Collectors.toList()); + commit = accountForTransferOnContractCallStorageService.saveAccountList(list); + } else { + List list = Arrays.asList(addresses).stream().map(a -> AddressTool.getAddress(a)).collect(Collectors.toList()); + commit = accountForTransferOnContractCallStorageService.removeAccount(list); + } + + } + //保存失败，抛异常 + if (!commit) { + LoggerUtil.LOG.error("AccountForTransferOnContractCall tx commit error"); + throw new NulsException(AccountErrorCode.ALIAS_SAVE_ERROR); + } + } + } catch (Exception e) { + errorLogProcess(chain, e); + result = false; + } + return result; + } + + private void errorLogProcess(Chain chain, Exception e) { + if (chain == null) { + LOG.error(e); + } else { + chain.getLogger().error(e); + } + } + +} diff --git a/module/nuls-account/src/main/resources/protocol-config.json b/module/nuls-account/src/main/resources/protocol-config.json index 65658d9614..33b0a4c278 100644 --- a/module/nuls-account/src/main/resources/protocol-config.json +++ b/module/nuls-account/src/main/resources/protocol-config.json @@ -1,4 +1,63 @@ [ + { + "version": "13", + "extend": "12", + "validTxs": [ + { + "type": "65", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountForTransferOnContractCallProcessorV13" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "12", + "extend": "11", + "validTxs": [ + { + "type": "63", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountLockProcessorV12" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "11", + "extend": "1", + "validTxs": [ + { + "type": "63", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountLockProcessorV11" + }, + { + "type": "64", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountUnlockProcessorV11" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, { "version": "1", "extend": "", diff --git a/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java b/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java index 5364ba41d4..a389187ad4 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java +++ b/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java @@ -26,22 +26,55 @@ import io.nuls.account.constant.AccountConstant; import io.nuls.account.constant.RpcConstant; +import io.nuls.account.model.bo.Account; +import io.nuls.account.model.bo.Chain; +import io.nuls.account.model.bo.config.ConfigBean; +import io.nuls.account.model.bo.tx.AccountBlockExtend; +import io.nuls.account.model.bo.tx.AccountBlockInfo; +import io.nuls.account.model.bo.tx.txdata.AccountBlockData; +import io.nuls.account.model.bo.tx.txdata.AccountContractCallData; import io.nuls.account.model.dto.CoinDTO; +import io.nuls.account.util.AccountTool; import io.nuls.account.util.LoggerUtil; +import io.nuls.account.util.TxUtil; import io.nuls.base.RPCUtil; -import io.nuls.base.data.NulsHash; -import io.nuls.base.data.Transaction; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.*; +import io.nuls.base.signture.MultiSignTxSignature; +import io.nuls.base.signture.P2PHKSignature; +import io.nuls.base.signture.SignatureUtil; +import io.nuls.base.signture.TransactionSignature; +import io.nuls.core.constant.TxType; +import io.nuls.core.crypto.ECKey; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.exception.NulsException; +import io.nuls.core.io.IoUtils; +import io.nuls.core.log.Log; +import io.nuls.core.parse.I18nUtils; +import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.info.NoUse; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; +import io.nuls.v2.model.dto.RpcResult; +import io.nuls.v2.util.JsonRpcUtil; +import org.apache.commons.io.IOUtils; import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.io.File; +import java.io.FileInputStream; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author: Charlie @@ -71,15 +104,702 @@ public class Transfer implements Runnable { private String addressTo; - public Transfer(String addressFrom, String addressTo) { - this.addressFrom = addressFrom; - this.addressTo = addressTo; + public Transfer() { + } + + //public Transfer(String addressFrom, String addressTo) { + // this.addressFrom = addressFrom; + // this.addressTo = addressTo; + //} + + @BeforeClass + public static void initClass() { + Log.info("init log."); + I18nUtils.loadLanguage(Transfer.class, "languages", "en"); } @Before public void before() throws Exception { - NoUse.mockModule(); - ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); + //NoUse.mockModule(); + //ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); + } + + @Test + public void createAccount() throws NulsException { + Account account = AccountTool.createAccount(1); + System.out.println(HexUtil.encode(account.getPriKey())); + System.out.println(HexUtil.encode(account.getPubKey())); + System.out.println(account.getAddress().toString()); + } + + @Test + public void createMultiSigAccountTest() throws Exception { + //create 3 account + List accountList = new ArrayList<>(); + accountList.add(AccountTool.createAccount(2)); + accountList.add(AccountTool.createAccount(2)); + accountList.add(AccountTool.createAccount(2)); + + Map params = new HashMap<>(); + List pubKeys = new ArrayList<>(); + for (Account account : accountList) { + System.out.println(HexUtil.encode(account.getPriKey())); + pubKeys.add(HexUtil.encode(account.getPubKey())); + } + params.put(Constants.VERSION_KEY_STR, "1.0"); + params.put(Constants.CHAIN_ID, chainId); + params.put("pubKeys", pubKeys); + params.put("minSigns", 2); + //create the multi sign accout + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.AC.abbr, "ac_createMultiSignAccount", params); + assertNotNull(cmdResp); + System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); + HashMap result = (HashMap) ((HashMap) cmdResp.getResponseData()).get("ac_createMultiSignAccount"); + assertNotNull(result); + String address = (String) result.get("address"); + assertNotNull(address); + int resultMinSigns = (int) result.get("minSign"); + assertEquals(resultMinSigns, 2); + List resultPubKeys = (List) result.get("pubKeys"); + assertNotNull(resultPubKeys); + assertEquals(pubKeys.size(), 3); + } + + String fromStr, rpcAddress; + String fromKey; + + private void setDev() { + chainId = 2; + assetChainId = 2; + assetId = 1; + fromKey = "2cca1c7f69f929680a00d45298dca7b705d87d34ae1dbbcb4125b5663552db36"; + // tNULSeBaMfMk3RGzotV3Dw788NFTP52ep7SMnJ + byte[] addressByPrikey = AddressTool.getAddress(ECKey.fromPrivate(HexUtil.decode(fromKey)).getPubKey(), chainId, "tNuls"); + fromStr = AddressTool.getStringAddressByBytes(addressByPrikey); + } + + private void setTest() { + chainId = 2; + assetChainId = 2; + assetId = 1; + fromStr = "tNULSeBaNE8nFpFo6qYiPiNHSbsGyKSceJLwQt"; + rpcAddress = "http://beta.api.nuls.io/jsonrpc"; + } + + private void setMain() { + chainId = 1; + assetChainId = 1; + assetId = 1; + fromStr = "NULSd6Hh5e4o3N3y6FnHeGhECFXrETqSzbapx"; + rpcAddress = "https://api.nuls.io/jsonrpc"; + } + + @Test + public void accountBlockMultiSignTest() throws Exception { + setMain(); + //setTest(); + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + + Transaction tx = new Transaction(); + tx.setType(TxType.BLOCK_ACCOUNT); + CoinData coinData = new CoinData(); + + + byte[] from = AddressTool.getAddress(fromStr); + byte[] nonce; + RpcResult request = JsonRpcUtil.request(rpcAddress, "getAccountBalance", List.of(chainId, assetChainId, assetId, fromStr)); + Map result = (Map) request.getResult(); + String nonceStr = (String) result.get("nonce"); + if (null == nonceStr) { + nonce = HexUtil.decode("0000000000000000"); + } else { + nonce = HexUtil.decode(nonceStr); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + AccountBlockData data = new AccountBlockData(); + /*File file0 = new File("/Users/pierreluo/Nuls/address_block_finally"); + List list0 = IOUtils.readLines(new FileInputStream(file0), StandardCharsets.UTF_8.name()); + System.out.println("read 0 length: " + list0.size()); + Set set0 = list0.stream().map(a -> a.trim()).collect(Collectors.toSet()); + System.out.println("deduplication 0 length: " + set0.size()); + + File file1 = new File("/Users/pierreluo/Nuls/address_block_for_nerve"); + List list = IOUtils.readLines(new FileInputStream(file1), StandardCharsets.UTF_8.name()); + System.out.println("read length: " + list.size()); + Set set = list.stream().map(a -> a.trim()).filter(a -> !set0.contains(a)).collect(Collectors.toSet()); + System.out.println("deduplication length: " + set.size()); + System.out.println(Arrays.toString(set.toArray())); + data.setAddresses(set.toArray(new String[set.size()]));*/ + data.setAddresses(new String[]{ + "NULSd6Hgbcn7gdGuapjgM8QsSTBtqsgKZ7Y8v" + }); + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + System.out.println(String.format("交易大小: %s", tx.size())); + + String[] pubkeys = new String[]{ + "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad", + "029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020", + "02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb", + "020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8", + "02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195"}; + List pubkeyList = Arrays.asList(pubkeys); + List collect = pubkeyList.stream().map(p -> HexUtil.decode(p)).collect(Collectors.toList()); + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.setM((byte) 3); + transactionSignature.setPubKeyList(collect); + tx.setTransactionSignature(transactionSignature.serialize()); + + List p2PHKSignatures = new ArrayList<>(); + List priKeyList = new ArrayList<>(); + priKeyList.add("???"); + for (String pri : priKeyList) { + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + } + tx.setTransactionSignature(transactionSignature.serialize()); + System.out.println(HexUtil.encode(tx.serialize())); + } + + @Test + public void accountBlockMultiSignProtocol12Test() throws Exception { + setMain(); + //setTest(); + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + + Transaction tx = new Transaction(); + tx.setType(TxType.BLOCK_ACCOUNT); + CoinData coinData = new CoinData(); + byte[] from = AddressTool.getAddress(fromStr); + byte[] nonce; + RpcResult request0 = JsonRpcUtil.request(rpcAddress, "getAccountBalance", List.of(chainId, assetChainId, assetId, fromStr)); + Map result0 = (Map) request0.getResult(); + String nonceStr = (String) result0.get("nonce"); + if (null == nonceStr) { + nonce = HexUtil.decode("0000000000000000"); + } else { + nonce = HexUtil.decode(nonceStr); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + + List blockDatas = new ArrayList<>(); + // 锁定列表: 地址，操作类型(1-加入白名单 2-移除白名单)，白名单交易类型清单，白名单合约地址清单 + blockDatas.add(new Object[]{"NULSd6HgZkPDuWG7vZP8yQiLwMSxEFzY1rUNr", 1, List.of(16), List.of("NULSd6HgntyX6aBo9ipFSxh9v7Tp2JZmG4rSA")}); + AccountBlockData data = this.makeTxData(blockDatas); + /*File file0 = new File("/Users/pierreluo/Nuls/pocm_deposit.txt"); + List list0 = IOUtils.readLines(new FileInputStream(file0), StandardCharsets.UTF_8.name()); + System.out.println("read 0 length: " + list0.size()); + Set unLockUsers = new HashSet<>(); + Map> userMap = new HashMap<>(); + for (String str : list0) { + String[] split = str.split("\\s+"); + String contract = split[1].trim(); + String user = split[2].trim(); + if (unLockUsers.contains(user)) { + System.out.println(String.format("用户[%s]未锁定[已检查]", user)); + continue; + } + RpcResult request = JsonRpcUtil.request(rpcAddress, "isBlockAccount", List.of(chainId, user)); + Map result = (Map) request.getResult(); + Boolean isBlock = (Boolean) result.get("value"); + if (!isBlock) { + unLockUsers.add(user); + System.out.println(String.format("用户[%s]未锁定", user)); + continue; + } + Set userContractList = userMap.computeIfAbsent(user, u -> new HashSet<>()); + userContractList.add(contract); + } + // 锁定列表: 地址，操作类型(1-加入白名单 2-移除白名单)，白名单交易类型清单，白名单合约地址清单 + List blockDatas = new ArrayList<>(); + Set>> entries = userMap.entrySet(); + for (Map.Entry> entry : entries) { + String user = entry.getKey(); + Set contracts = entry.getValue(); + if (contracts.isEmpty()) { + System.out.println(String.format("用户[%s]没有质押的合约", user)); + } + blockDatas.add(new Object[]{user, 1, List.of(16), contracts.stream().collect(Collectors.toList())}); + } + AccountBlockData data = this.makeTxData(blockDatas);*/ + + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + System.out.println(String.format("交易大小: %s", tx.size())); + + String[] pubkeys = new String[]{ + "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad", + "029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020", + "02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb", + "020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8", + "02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195"}; + List pubkeyList = Arrays.asList(pubkeys); + List collect = pubkeyList.stream().map(p -> HexUtil.decode(p)).collect(Collectors.toList()); + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.setM((byte) 3); + transactionSignature.setPubKeyList(collect); + tx.setTransactionSignature(transactionSignature.serialize()); + + List p2PHKSignatures = new ArrayList<>(); + List priKeyList = new ArrayList<>(); + priKeyList.add("???"); + for (String pri : priKeyList) { + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + } + tx.setTransactionSignature(transactionSignature.serialize()); + System.out.println(HexUtil.encode(tx.serialize())); + //Response response = this.newTx(tx); + //System.out.println(JSONUtils.obj2PrettyJson(response)); + } + + @Test + public void makeDataFromPocmUserTest() throws Exception { + setMain(); + File file0 = new File("/Users/pierreluo/Nuls/pocm_deposit.txt"); + List list0 = IOUtils.readLines(new FileInputStream(file0), StandardCharsets.UTF_8.name()); + System.out.println("read 0 length: " + list0.size()); + + Map> userMap = new HashMap<>(); + for (String str : list0) { + String[] split = str.split("\\s+"); + String contract = split[1].trim(); + String user = split[2].trim(); + RpcResult request = JsonRpcUtil.request(rpcAddress, "isBlockAccount", List.of(chainId, user)); + Map result = (Map) request.getResult(); + Boolean isBlock = (Boolean) result.get("value"); + if (!isBlock) { + System.out.println(String.format("用户[%s]未锁定", user)); + continue; + } + Set userContractList = userMap.computeIfAbsent(user, u -> new HashSet<>()); + userContractList.add(contract); + } + // 锁定列表: 地址，操作类型(1-加入白名单 2-移除白名单)，白名单交易类型清单，白名单合约地址清单 + List blockDatas = new ArrayList<>(); + Set>> entries = userMap.entrySet(); + for (Map.Entry> entry : entries) { + String user = entry.getKey(); + Set contracts = entry.getValue(); + if (contracts.isEmpty()) { + System.out.println(String.format("用户[%s]没有质押的合约", user)); + } + blockDatas.add(new Object[]{user, 1, List.of(16), contracts.stream().collect(Collectors.toList())}); + } + AccountBlockData data = this.makeTxData(blockDatas); + System.out.println(); + + } + + @Test + public void accountUnBlockMultiSignTest() throws Exception { + //setMain(); + setTest(); + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + + Transaction tx = new Transaction(); + tx.setType(TxType.UNBLOCK_ACCOUNT); + CoinData coinData = new CoinData(); + byte[] from = AddressTool.getAddress(fromStr); + + byte[] nonce; + RpcResult request = JsonRpcUtil.request(rpcAddress, "getAccountBalance", List.of(chainId, assetChainId, assetId, fromStr)); + Map result = (Map) request.getResult(); + String nonceStr = (String) result.get("nonce"); + if (null == nonceStr) { + nonce = HexUtil.decode("0000000000000000"); + } else { + nonce = HexUtil.decode(nonceStr); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + AccountBlockData data = new AccountBlockData(); + data.setAddresses(new String[]{ + "tNULSeBaMrENtjYwHzpZNadKpd3gvAAy39LUKb" + }); + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + + String[] pubkeys = new String[]{ + "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad", + "029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020", + "02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb", + "020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8", + "02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195"}; + List pubkeyList = Arrays.asList(pubkeys); + List collect = pubkeyList.stream().map(p -> HexUtil.decode(p)).collect(Collectors.toList()); + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.setM((byte) 3); + transactionSignature.setPubKeyList(collect); + tx.setTransactionSignature(transactionSignature.serialize()); + + List p2PHKSignatures = new ArrayList<>(); + List priKeyList = new ArrayList<>(); + priKeyList.add("???"); + for (String pri : priKeyList) { + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + } + tx.setTransactionSignature(transactionSignature.serialize()); + System.out.println(HexUtil.encode(tx.serialize())); + } + + @Test + public void appendSignature() throws Exception { + //setDev(); + String pri = "???"; + String txHex = "0200ca5af1611e7472616e73666572207472616e73616374696f6e2072656d61726b2e2e2e008c011702000125d3ea472bcaf2e917dc94d8adb8b63b98a5267002000100a08eb02f0000000000000000000000000000000000000000000000000000000008f14e5e70f2072dc5000117020001f7ec6473df12e751d64cf20a8baa7edd50810f81020001000008af2f000000000000000000000000000000000000000000000000000000000000000000000000fd3c012102c4171414b582549b178b148e5825d372ac8c4217832f111da56185d6c8b97a0247304502203bbe4619384bc102aa61991a6977cb93d2408e4279e65b81cc6039c640f01dc4022100f4374970a80e68e57b852e3b7280f8dc67206920f568d5659e845a5a61d1f2862102b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa9319546304402203c215cca926884b1496e2ffd989cc0dfe89d5fa011a5b0940aaf3ccc6d8e70d902200fb5e65f457551d8d68d95e80ec7c88fe5594ab6de7fd878d1ee2538971478b021020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf846304402204e6a1de48907f478f5d926d6d8cc915863d1745ba62e14f92d81b95bbdab26d2022018c37949d032d4b7924ff603b61a0e8c207b0a01db4ef65a11fd6fa77ba179ae"; + Transaction tx = new Transaction(); + tx.parse(HexUtil.decode(txHex), 0); + TransactionSignature transactionSignature = new TransactionSignature(); + transactionSignature.parse(tx.getTransactionSignature(), 0); + List p2PHKSignatures = transactionSignature.getP2PHKSignatures(); + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + tx.setTransactionSignature(transactionSignature.serialize()); + System.out.println(HexUtil.encode(tx.serialize())); + } + + @Test + public void txMultiSignTest() throws Exception { + String filePath = "???"; + String txHex = IoUtils.readBytesToString(new File(filePath)); + String pri = "???"; + Transaction tx = new Transaction(); + tx.parse(HexUtil.decode(txHex), 0); + + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.parse(tx.getTransactionSignature(), 0); + + List p2PHKSignatures = transactionSignature.getP2PHKSignatures(); + + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + tx.setTransactionSignature(transactionSignature.serialize()); + System.out.println(HexUtil.encode(tx.serialize())); + } + + @Test + public void getAllBlockAccount() throws Exception { + Map params = new HashMap<>(); + params.put(Constants.VERSION_KEY_STR, "1.0"); + params.put(Constants.CHAIN_ID, chainId); + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.AC.abbr, "ac_getAllBlockAccount", params); + System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); + } + + @Test + public void getBlockAccountInfo() throws Exception { + List list = new ArrayList<>(); + list.add("tNULSeBaMtkzQ1tH8JWBGZDCmRHCmySevE4frM"); + list.add("tNULSeBaMhKaLzhQh1AhhecUqh15ZKw98peg29"); + list.add("tNULSeBaMv8q3pWzS7bHpQWW8yypNGo8auRoPf"); + list.add("tNULSeBaMmbiCH5soCFasXnG4TwqknyTzYBM3S"); + list.add("tNULSeBaMsUBLVxwoaswjWvghJyoUJfbfB6dja"); + list.add("tNULSeBaMi5yGkDbDgKGGX8TGxYdDttZ4KhpMv"); + + for (String address : list) { + Map params = new HashMap<>(); + params.put(Constants.VERSION_KEY_STR, "1.0"); + params.put(Constants.CHAIN_ID, chainId); + params.put("address", address); + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.AC.abbr, "ac_getBlockAccountInfo", params); + System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); + } + } + + private int[] list2array(List list) { + int[] result = new int[list.size()]; + int i = 0; + for (Integer a : list) { + result[i++] = a.intValue(); + } + return result; + } + + private AccountBlockData makeTxData(List list) throws Exception { + List infoList = new ArrayList<>(); + String[] addresses = new String[list.size()]; + int i = 0; + for (Object[] objs : list) { + String address = (String) objs[0]; + Integer operationType = (Integer) objs[1]; + List types = (List) objs[2]; + addresses[i++] = address; + AccountBlockInfo info = new AccountBlockInfo(); + info.setOperationType(operationType); + info.setTypes(this.list2array(types)); + if (objs.length > 3) { + List contracts = (List) objs[3]; + info.setContracts(contracts.toArray(new String[contracts.size()])); + } + infoList.add(info); + } + AccountBlockData data = new AccountBlockData(); + data.setAddresses(addresses); + AccountBlockExtend extend = new AccountBlockExtend(); + extend.setInfos(infoList.toArray(new AccountBlockInfo[infoList.size()])); + data.setExtend(extend.serialize()); + return data; + } + + @Test + public void accountBlockTest() throws Exception { + setDev(); + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + + Transaction tx = new Transaction(); + tx.setType(TxType.BLOCK_ACCOUNT); + CoinData coinData = new CoinData(); + byte[] from = AddressTool.getAddress(fromStr); + byte[] nonce = TxUtil.getBalanceNonce(chain, assetChainId, assetId, from).getNonce(); + if (null == nonce) { + nonce = HexUtil.decode("0000000000000000"); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + + List blockDatas = new ArrayList<>(); + // 锁定列表: 地址，操作类型(1-加入白名单 2-移除白名单)，白名单交易类型清单 + blockDatas.add(new Object[]{"tNULSeBaMtkzQ1tH8JWBGZDCmRHCmySevE4frM", 2, List.of(3)}); + blockDatas.add(new Object[]{"tNULSeBaMhKaLzhQh1AhhecUqh15ZKw98peg29", 2, List.of(), List.of("tNULSeBaNA8cXq6wxnAwtgCJrYX9P1iosCzd1H")}); + blockDatas.add(new Object[]{"tNULSeBaMv8q3pWzS7bHpQWW8yypNGo8auRoPf", 1, List.of(2, 3)}); + blockDatas.add(new Object[]{"tNULSeBaMmbiCH5soCFasXnG4TwqknyTzYBM3S", 1, List.of(3)}); + AccountBlockData data = this.makeTxData(blockDatas); + + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + TransactionSignature transactionSignature = new TransactionSignature(); + List p2PHKSignatures = new ArrayList<>(); + //根据密码获得ECKey get ECKey from Password + ECKey ecKey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(fromKey))); + byte[] signBytes = SignatureUtil.signDigest(tx.getHash().getBytes(), ecKey).serialize(); + P2PHKSignature signature = new P2PHKSignature(signBytes, ecKey.getPubKey()); // TxUtil.getInstanceRpcStr(signatureStr, P2PHKSignature.class); + p2PHKSignatures.add(signature); + //交易签名 + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + tx.setTransactionSignature(transactionSignature.serialize()); + Response response = this.newTx(tx); + System.out.println(JSONUtils.obj2PrettyJson(response)); + } + + @Test + public void accountUnBlockTest() throws Exception { + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + + Transaction tx = new Transaction(); + tx.setType(TxType.UNBLOCK_ACCOUNT); + CoinData coinData = new CoinData(); + String fromKey = "???"; + byte[] from = AddressTool.getAddress("tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"); + byte[] nonce = TxUtil.getBalanceNonce(chain, assetChainId, assetId, from).getNonce(); + if (null == nonce) { + nonce = HexUtil.decode("0000000000000000"); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + AccountBlockData data = new AccountBlockData(); + data.setAddresses(new String[]{ + "tNULSeBaMrbMRiFAUeeAt6swb4xVBNyi81YL24", + "tNULSeBaMu38g1vnJsSZUCwTDU9GsE5TVNUtpD" + }); + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + TransactionSignature transactionSignature = new TransactionSignature(); + List p2PHKSignatures = new ArrayList<>(); + //根据密码获得ECKey get ECKey from Password + ECKey ecKey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(fromKey))); + byte[] signBytes = SignatureUtil.signDigest(tx.getHash().getBytes(), ecKey).serialize(); + P2PHKSignature signature = new P2PHKSignature(signBytes, ecKey.getPubKey()); // TxUtil.getInstanceRpcStr(signatureStr, P2PHKSignature.class); + p2PHKSignatures.add(signature); + //交易签名 + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + tx.setTransactionSignature(transactionSignature.serialize()); + Response response = this.newTx(tx); + System.out.println(JSONUtils.obj2PrettyJson(response)); + } + + /** + * 设置 调用合约允许普通转账的账户白名单 + */ + @Test + public void accountForTransferOnContractCallTest() throws Exception { + setDev(); + // 设置增加或者移除白名单 + String type = "ADD"; // ADD or REMOVE + + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + Transaction tx = new Transaction(); + tx.setType(TxType.ACCOUNT_FOR_TRANSFER_ON_CONTRACT_CALL); + CoinData coinData = new CoinData(); + String fromKey = "477059f40708313626cccd26f276646e4466032cabceccbf571a7c46f954eb75"; + byte[] from = AddressTool.getAddress("tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"); + byte[] nonce = TxUtil.getBalanceNonce(chain, assetChainId, assetId, from).getNonce(); + if (null == nonce) { + nonce = HexUtil.decode("0000000000000000"); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + AccountContractCallData data = new AccountContractCallData(); + data.setAddresses(new String[]{ + "tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7", + "tNULSeBaMfXDQeT4MJZim1RusCJRPx5j9bMKQN" + }); + if (!"ADD".equalsIgnoreCase(type) && !"REMOVE".equalsIgnoreCase(type)) { + throw new Exception("错误的类型，设置增加或者移除白名单。ADD or REMOVE"); + } + data.setType("ADD".equalsIgnoreCase(type) ? 1 : 2); + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + TransactionSignature transactionSignature = new TransactionSignature(); + List p2PHKSignatures = new ArrayList<>(); + //根据密码获得ECKey get ECKey from Password + ECKey ecKey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(fromKey))); + byte[] signBytes = SignatureUtil.signDigest(tx.getHash().getBytes(), ecKey).serialize(); + P2PHKSignature signature = new P2PHKSignature(signBytes, ecKey.getPubKey()); // TxUtil.getInstanceRpcStr(signatureStr, P2PHKSignature.class); + p2PHKSignatures.add(signature); + //交易签名 + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + tx.setTransactionSignature(transactionSignature.serialize()); + Response response = this.newTx(tx); + System.out.println(JSONUtils.obj2PrettyJson(response)); + } + + @Test + public void accountForTransferOnContractCallMultiSignTest() throws Exception { + //setMain(); + setTest(); + + // 设置增加或者移除白名单 + String type = "ADD"; // ADD or REMOVE + String[] whitelist = { + "tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7" + }; + + Chain chain = new Chain(); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + chain.setConfig(configBean); + + Transaction tx = new Transaction(); + tx.setType(TxType.ACCOUNT_FOR_TRANSFER_ON_CONTRACT_CALL); + CoinData coinData = new CoinData(); + + + byte[] from = AddressTool.getAddress(fromStr); + byte[] nonce; + RpcResult request = JsonRpcUtil.request(rpcAddress, "getAccountBalance", List.of(chainId, assetChainId, assetId, fromStr)); + Map result = (Map) request.getResult(); + String nonceStr = (String) result.get("nonce"); + if (null == nonceStr) { + nonce = HexUtil.decode("0000000000000000"); + } else { + nonce = HexUtil.decode(nonceStr); + } + coinData.addFrom(new CoinFrom(from, assetChainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger(), nonce, (byte) 0)); + coinData.addTo(new CoinTo(from, assetChainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + AccountContractCallData data = new AccountContractCallData(); + data.setAddresses(whitelist); + if (!"ADD".equalsIgnoreCase(type) && !"REMOVE".equalsIgnoreCase(type)) { + throw new Exception("错误的类型，设置增加或者移除白名单。ADD or REMOVE"); + } + data.setType("ADD".equalsIgnoreCase(type) ? 1 : 2); + tx.setTxData(data.serialize()); + tx.setTime(System.currentTimeMillis() / 1000); + tx.setHash(NulsHash.calcHash(tx.serializeForHash())); + System.out.println(String.format("交易大小: %s", tx.size())); + + String[] pubkeys = new String[]{ + "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad", + "029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020", + "02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb", + "020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8", + "02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195"}; + List pubkeyList = Arrays.asList(pubkeys); + List collect = pubkeyList.stream().map(p -> HexUtil.decode(p)).collect(Collectors.toList()); + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.setM((byte) 3); + transactionSignature.setPubKeyList(collect); + tx.setTransactionSignature(transactionSignature.serialize()); + + List p2PHKSignatures = new ArrayList<>(); + List priKeyList = new ArrayList<>(); + priKeyList.add("???"); + for (String pri : priKeyList) { + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + } + tx.setTransactionSignature(transactionSignature.serialize()); + System.out.println(HexUtil.encode(tx.serialize())); + } + + @Test + public void blockTest() { + Set nodes = new HashSet<>(); + for (int i = 7396000; i < 7399782; i++) { + System.out.println(String.format("load block header: %s", i)); + RpcResult request = JsonRpcUtil.request("https://api.nuls.io/jsonrpc", "getHeaderByHeight", List.of(1, Long.valueOf(i))); + Map result = (Map) request.getResult(); + String packingAddress = (String) result.get("packingAddress"); + Integer blockVersion = (Integer) result.get("blockVersion"); + if (blockVersion.intValue() < 11) { + nodes.add(packingAddress); + } + } + nodes.stream().forEach(n -> System.out.println(n)); } @Override @@ -95,7 +815,7 @@ public void run() { } } - private NulsHash transfer(NulsHash hash) throws Exception{ + private NulsHash transfer(NulsHash hash) throws Exception { //Map transferMap = CreateTx.createTransferTx(addressFrom, addressTo, new BigInteger("1000000000")); Map transferMap = CreateTx.createAssetsTransferTx(addressFrom, addressTo); Transaction tx = CreateTx.assemblyTransaction((List) transferMap.get("inputs"), @@ -109,7 +829,7 @@ private NulsHash transfer(NulsHash hash) throws Exception{ } - private Response newTx(Transaction tx) throws Exception{ + private Response newTx(Transaction tx) throws Exception { Map params = new HashMap<>(AccountConstant.INIT_CAPACITY_8); params.put(Constants.VERSION_KEY_STR, RpcConstant.TX_NEW_VERSION); params.put(RpcConstant.TX_CHAIN_ID, chainId); diff --git a/module/nuls-account/src/test/java/io/nuls/account/tx/TxTest.java b/module/nuls-account/src/test/java/io/nuls/account/tx/TxTest.java index 69c4d8bea5..597d801467 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/tx/TxTest.java +++ b/module/nuls-account/src/test/java/io/nuls/account/tx/TxTest.java @@ -87,13 +87,13 @@ public void importPriKeyTest() { @Test public void mTransfer() throws Exception { - Transfer transfer1 = new Transfer(address21, address20); - Thread thread1 = new Thread(transfer1); - thread1.start(); + //Transfer transfer1 = new Transfer(address21, address20); + //Thread thread1 = new Thread(transfer1); + //thread1.start(); // Transfer transfer2 = new Transfer(address25, address20); // Thread thread2 = new Thread(transfer2); // thread2.start(); - thread1.join(); +// thread1.join(); // thread2.join(); } diff --git a/module/nuls-account/src/test/java/io/nuls/account/util/AddressToolTest.java b/module/nuls-account/src/test/java/io/nuls/account/util/AddressToolTest.java index da36d03202..fa28de9632 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/util/AddressToolTest.java +++ b/module/nuls-account/src/test/java/io/nuls/account/util/AddressToolTest.java @@ -39,6 +39,12 @@ public void test7y() throws NulsException, io.nuls.sdk.core.exception.NulsExcept } } + @Test + public void createAddress(){ + ECKey ecKey = new ECKey(); + System.out.println(AddressTool.getAddressString(ecKey.getPubKey(),1)+" ==== "+ecKey.getPrivateKeyAsHex()); + } + @Test public void createAccountByPrefix() { AddressTool.addPrefix(4, "LJS"); diff --git a/module/nuls-api/documents/nuls-api_JSONRPC.md b/module/nuls-api/documents/nuls-api_JSONRPC.md index 7bcf2a643c..d257c01b94 100644 --- a/module/nuls-api/documents/nuls-api_JSONRPC.md +++ b/module/nuls-api/documents/nuls-api_JSONRPC.md @@ -8,12 +8,12 @@ ## 设置 -​ `NULS-API`模块默认访问的端口号是8004，可以在nuls.ncf配置文件中做修改，如下： +​ `NULS-API`模块默认访问的端口号是18004，可以在nuls.ncf配置文件中做修改，如下： ``` [nuls-API] #httpServer的启动port -serverPort=8004 +serverPort=18004 ``` ## 说明 @@ -24,45 +24,27 @@ serverPort=8004 `NULS-API`模块提供了若干在线接口和离线接口。 -#### 在线接口 +在线接口：钱包必须正常运行，且能够连接网络中的其他节点，能够正常同步区块和广播数据。在调用在线接口之前，最好是已经同步到最新区块。接口所产生的数据都会保存在钱包中。例如创建账户、修改密码、转账、获取区块头等。 -即需要访问节点钱包API，才能得到正确的返回结果。访问在线接口有以下几点要求： +离线接口：NULS2.0提供了一个专门用于[离线操作的NULS-API工具](http://nuls-cn.oss-cn-hangzhou.aliyuncs.com/2.1/NULS_API-offline_v2.0.0.tar.gz)。无需安装钱包，可独立运行在一台没有连接网络的服务器上。用户通过调用离线接口，传入相关的参数，获取返回值，相应数据不会存入钱包。例如离线创建账户、离线组装转账交易、离线签名等。 -- 需安装节点钱包且必须正常运行。 -- 节点钱包能够连接网络中的其他节点，能够正常同步区块和广播数据。 -- 在调用在线接口之前，节点钱包最好是已经同步到最新区块。 +### 字段描述 -在线接口所产生的数据都会保存在钱包中。例如创建账户、修改密码、转账交易、获取区块头等。 +**链的chainId:** -#### 离线接口 +​ NULS2.0支持多链并行和跨链转账，每条链通过链ID来区分，NULS主网的链ID为1，NULS测试网的链ID为2。 -NULS2.0提供了一个专门用于[离线操作的NULS-API工具](http://nuls-cn.oss-cn-hangzhou.aliyuncs.com/2.1/NULS_API-offline_v2.0.0.tar.gz)。无需安装钱包，可独立运行在一台没有连接网络的服务器上。用户通过调用离线接口，传入相关的参数，获取返回值，相应数据不会存入钱包。例如离线创建账户、离线组装转账交易、离线签名等。 +**链的资产：** -### 字段与业务描述 +​ NULS2.0支持每条链除了默认的资产外，可根据业务需要，动态添加资产。每条链的每种资产通过链ID和资产ID的复合主键来区分。例如NULS主网的NULS，chainId=1,assetId=1 -#### 链的chainId +**交易的type值：** -​ NULS2.0支持多链并行和跨链转账，每条链通过链ID（chainId）来区分，NULS主网的链ID为1，NULS测试网的链ID为2。 - -#### 链的资产 - -​ NULS2.0还支持多资产，每条链除了默认的资产外，可根据业务需要，动态添加资产。每种资产通过链ID（chainId）和资产ID（assetId）的复合主键来区分。例如NULS主网的NULS资产（chainId=1,assetId=1） - -​ **主资产：每条链的默认资产就是主资产，交易手续费只收取本链主资产。** - -#### 合约资产 - -​ NULS2.0内置智能合约，用户可以通过NULS官方提供的标准NRC20合约模板发布合约资产(token)，每发布一个合约资产都有唯一合约地址作为标记。 - -​ 这里需要注意的是合约资产并不等于链的资产，链的资产是会在链上分配有chainId和assetId属性的，而合约资产并没有。 - -#### 交易类型 - -​ NULS2.0默认有多种交易，每种交易的功能不同，调用接口查询交易详情时，可通过交易类型字段（type）来区分不同交易类型，以下是交易类型的枚举值： +​ NULS2.0默认有多种交易，每种交易的功能不同，调用接口查询交易详情时，可通过type字段来区分不同交易类型，以下是交易类型的枚举值： ``` int COIN_BASE = 1; // coinBase出块奖励 -int TRANSFER = 2; // 普通转账 +int TRANSFER = 2; // 转账 int ACCOUNT_ALIAS = 3; // 设置账户别名 int REGISTER_AGENT = 4; // 新建共识节点 int DEPOSIT = 5; // 委托参与共识 @@ -85,129 +67,18 @@ int CONTRACT_DEPOSIT = 21; // 合约委托参与共识 int CONTRACT_CANCEL_DEPOSIT = 22; // 合约取消委托共识 int CONTRACT_STOP_AGENT = 23; // 合约注销共识节点 int VERIFIER_CHANGE = 24; // 验证人变更 -int VERIFIER_INIT = 25; // 验证人初始化 -int CONTRACT_TOKEN_CROSS_TRANSFER = 26; // 合约跨链转账 +int VERIFIER_INIT = 25; //验证人初始化 ``` -#### 转账 - -​ 转账交易分为4种：**普通转账、跨链转账、合约转账、合约跨链转账。**其中普通转账和跨链转账针对是链上资产（分配有chainId和assetId）。后两者针对合约token的转账。 - -​ **普通转账（type=2）：**也叫链内转账，交易支持多对多的转账操作。多对多有两层含义，一是资产可以是多个，二是转账地址可以是多个。转账人、转账资产、转账金额都体现在交易的from和to里，后面会详细说明。 - -​ **跨链转账（type=10）：**跨链转账是指将链上资产跨链转到别的NULS平行链上去。同普通转账一样，也支持多对多的转账操作，体现在交易的from和to里。 - -​ **合约转账（type=16）：**合约转账只支持合约token的链内转账，它实际上是通过调用智能合约完成的。交易的from和to里只包含手续费。 - -​ **合约跨链转账（type=26）：**合约的跨链转账，也是通过调用智能合约完成的。但是节点在打包区块解析智能合约后，系统内部生成一个type=10的跨链交易，一同打包到区块内。所以实际上合约跨链转账是通过两个交易来实现。 - -#### 交易的from和to +**交易的from和to：** 用转账交易为例：tx.type = 2 -``` -tx:{ - "hash": "9c10fdf7162b00ac9a0972fcdc81c68d4f41383f025196a4207372e78acc9a3f", //交易ID - "type": 2, - "from": [ - { - "address": "NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 1 - "assetsId": 1, - "amount": "100000100000", - "nonce": "86f0ae38296c6b9d", - "locked": 0 - } - ], - "to": [ - { - "address": "NULSeBaMnAh6nquK1PARuRzKVk5LcfmFEAu7X", - "assetsChainId": 1, - "assetsId": 1, - "amount": "100000000000", - "lockTime": 0 - } - ] -} -``` - -​ **from：**转账交易的转出方，每一个from视为一个地址的某一种资产转出多少数量。通过assetsChainId和assetsId确定某一个具体资产，address为转出地址，amount为转出数量。其中nonce值每次转账后都会改变，防止打包时出现双花，可通过调用查询账户余额接口获取当前最新nonce值。 - -​ **to：**转账交易的接收方，每一个to视为接收人接收到某一种资产多少数量，其中lockTime字段为锁定时间。当lockTime=0时，表示资产可以正常使用；当锁定时间大于0时，表示只有当现实时间（时间戳）超过这个值之后，这笔资产才能正常使用；当lockTime =-1时，表示永久锁定中，需要特殊的交易才能解除锁定，例如参与委托共识和取消委托共识。 - -#### 资产的永久锁定与解锁 - -​ NULS里支持特殊的交易将链上的资产永久锁定，通常这种永久锁定交易都是成对出现，再通过另一个交易解除锁定，从而实现一些复杂的业务逻辑。我们用委托参与共识交易（type=5）和退出取消委托共识（type=6）来举例说明。 - -**委托参与共识交易：** - -``` -tx:{ - "hash": "fce936c045d2f200598db030105ecce20fdf09f672897d4e0e18f6d8bd9dc023", //交易ID - "type": 5, - "from": [ - { - "address": "NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 1, - "assetsId": 1, - "amount": "100000100000", - "nonce": "207372e78acc9a3f", - "locked": 0 - } - ], - "to": [ - { - "address": "NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 1, - "assetsId": 1, - "amount": "100000000000", - "lockTime": -1 - } - ] -} -``` - -这个交易里type=5，from和to的地址相同，都是NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS，且to的lockTime = -1。表示自己通过委托共识交易永久锁定了部分资产,去参与共识获得出块奖励。 - -**取消委托共识交易：** - -``` -tx:{ - "hash": "ff6596e2489c591efa94eab27e082f902bc5fefb529416e00cd736a34029c08c", //交易ID - "type": 6, - "from": [ - { - "address": "tNULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 2, - "assetsId": 1, - "amount": "100000000000", //必须和锁定时的金额一致 - "nonce": "0e18f6d8bd9dc023", //必须是锁定交易的hash后8位 - "locked": -1 - } - ], - "to": [ - { - "address": "tNULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 2, - "assetsId": 1, - "amount": "99999900000", - "lockTime": 0 - } - ] -} -``` - -这个交易里from的locked = -1，表示为需要解锁一笔资产。需要注意的是，解锁交易的from必须和之前锁定交易的to保持一致，即assetsChainId、assetsId、amount值一样。nonce值则是之前锁定交易hash的后8位。 - -#### 交易手续费 - -​ 交易手续费 ：from里本链主资产之和 - to里本链主资产之和。 +​ from为转账交易的转出方，每一个from视为一个转账人的某一种资产转出多少数量，其中nonce值每次转账后都会改变，可通过调用查询账户余额接口获取当前最新nonce值。 -​ 手续费单价： +​ to为转账交易的接收方，每一个to视为接收人接收到某一种资产多少数量，其中lockTime为锁定时间。当锁定时间大于0时，表示现实时间超过这个值之后，这笔资产才能正常使用；当lockTime =-1时，表示永久锁定中，需要特殊的交易才能解除锁定，例如参与委托共识和取消委托共识。 -​ 转账交易（type=2）：0.001NULS/KB - -​ 其他交易：0.01NULS/KB +​ 交易的手续费 = from里本链主资产之和 - to里本链主资产之和 ## 访问方式 @@ -220,7 +91,7 @@ tx:{ URL: http://${ip}:${port}/jsonrpc - 示例: http://127.0.0.1:8004/jsonrpc + 示例: http://127.0.0.1:18004/jsonrpc 请求数据格式: @@ -314,11 +185,11 @@ _**详细描述: 获取本链相关信息,其中共识资产为本链创建共 _**详细描述: 创建的账户存在于本地钱包内**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------- | :------: | -------------------------------------------------------- | :------: | -| chainId | int | 链ID | 是 | -| count | int | 创建数量 | 是 | -| password | string | 8-20位长度的密码，字母与数字的组合，且密码首位必须是字母 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------- |:------:| ---- |:----:| +| chainId | int | 链ID | 是 | +| count | int | 创建数量 | 是 | +| password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -384,7 +255,7 @@ _**详细描述: 修改账户密码**_ ### 1.3 导出账户私钥 #### Cmd: getPriKey -_**详细描述: 导出本地钱包已存在账户的私钥**_ +_**详细描述: 只能导出本地钱包已存在账户的私钥**_ #### 参数列表 | 参数名 | 参数类型 | 参数描述 | 是否必填 | @@ -423,11 +294,11 @@ _**详细描述: 导出本地钱包已存在账户的私钥**_ _**详细描述: 导入私钥时，需要输入密码给明文私钥加密**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------- | :------: | -------------------- | :------: | -| chainId | int | 链ID | 是 | -| priKey | string | 账户明文私钥 | 是 | -| password | string | 新密码，用于加密私钥 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------- |:------:| ------ |:----:| +| chainId | int | 链ID | 是 | +| priKey | string | 账户明文私钥 | 是 | +| password | string | 新密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -544,15 +415,18 @@ _**详细描述: 根据资产链ID和资产ID，查询本链账户对应资产 | address | string | 账户地址 | 是 | #### 返回值 -| 字段名 | 字段类型 | 参数描述 | -| ------------- |:------:| ------------------------- | -| totalBalance | string | 总余额 | -| balance | string | 可用余额 | -| timeLock | string | 时间锁定金额 | -| consensusLock | string | 共识锁定金额 | -| freeze | string | 总锁定余额 | -| nonce | string | 账户资产nonce值 | -| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 | +| 字段名 | 字段类型 | 参数描述 | +| --------------- |:------:| ------------------------- | +| assetChainId | int | 资产链ID | +| assetId | int | 资产ID | +| contractAddress | string | 合约地址 | +| totalBalance | string | 总余额 | +| balance | string | 可用余额 | +| timeLock | string | 时间锁定金额 | +| consensusLock | string | 共识锁定金额 | +| freeze | string | 总锁定余额 | +| nonce | string | 账户资产nonce值 | +| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 | #### Example request data: ```json @@ -582,7 +456,37 @@ _**详细描述: 根据资产链ID和资产ID，查询本链账户对应资产 } ``` -### 1.8 设置账户别名 +### 1.8 查询账户余额 +#### Cmd: getBalanceList +_**详细描述: 根据资产链ID和资产ID，查询本链账户对应资产的余额与nonce值集合**_ + +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ----------- |:------:| ------- |:----:| +| chainId | int | 链ID | 是 | +| address | string | 账户地址 | 是 | +| assetIdList | list | 资产的ID集合 | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| --------------- |:------:| ------------------------- | +| assetChainId | int | 资产链ID | +| assetId | int | 资产ID | +| contractAddress | string | 合约地址 | +| totalBalance | string | 总余额 | +| balance | string | 可用余额 | +| timeLock | string | 时间锁定金额 | +| consensusLock | string | 共识锁定金额 | +| freeze | string | 总锁定余额 | +| nonce | string | 账户资产nonce值 | +| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 | +#### Example request data: +无 + +#### Example response data: +略 + +### 1.9 设置账户别名 #### Cmd: setAlias _**详细描述: 别名格式为1-20位小写字母和数字的组合，设置别名会销毁1个NULS**_ @@ -619,7 +523,7 @@ _**详细描述: 别名格式为1-20位小写字母和数字的组合，设置 } ``` -### 1.9 验证地址是否正确 +### 1.10 验证地址是否正确 #### Cmd: validateAddress _**详细描述: 验证地址是否正确**_ @@ -656,7 +560,7 @@ _**详细描述: 验证地址是否正确**_ } ``` -### 1.10 根据账户公钥生成账户地址 +### 1.11 根据账户公钥生成账户地址 #### Cmd: getAddressByPublicKey _**详细描述: 根据账户公钥生成账户地址**_ @@ -693,7 +597,7 @@ _**详细描述: 根据账户公钥生成账户地址**_ } ``` -### 1.11 离线 - 批量创建账户 +### 1.12 离线 - 批量创建账户 #### Cmd: createAccountOffline _**详细描述: 创建的账户不会保存到钱包中,接口直接返回账户的keystore信息**_ @@ -738,7 +642,7 @@ _**详细描述: 创建的账户不会保存到钱包中,接口直接返回账 } ``` -### 1.12 离线获取账户明文私钥 +### 1.13 离线获取账户明文私钥 #### Cmd: getPriKeyOffline _**详细描述: 离线获取账户明文私钥**_ @@ -777,7 +681,7 @@ _**详细描述: 离线获取账户明文私钥**_ } ``` -### 1.13 离线修改账户密码 +### 1.14 离线修改账户密码 #### Cmd: resetPasswordOffline _**详细描述: 离线修改账户密码**_ @@ -817,7 +721,7 @@ _**详细描述: 离线修改账户密码**_ } ``` -### 1.14 多账户摘要签名 +### 1.15 多账户摘要签名 #### Cmd: multiSign _**详细描述: 用于签名离线组装的多账户转账交易,调用接口时，参数可以传地址和私钥，或者传地址和加密私钥和加密密码**_ @@ -868,7 +772,7 @@ _**详细描述: 用于签名离线组装的多账户转账交易,调用接口 } ``` -### 1.15 明文私钥摘要签名 +### 1.16 明文私钥摘要签名 #### Cmd: priKeySign _**详细描述: 明文私钥摘要签名**_ @@ -909,7 +813,7 @@ _**详细描述: 明文私钥摘要签名**_ } ``` -### 1.16 密文私钥摘要签名 +### 1.17 密文私钥摘要签名 #### Cmd: encryptedPriKeySign _**详细描述: 密文私钥摘要签名**_ @@ -951,7 +855,7 @@ _**详细描述: 密文私钥摘要签名**_ } ``` -### 1.17 创建多签账户 +### 1.18 创建多签账户 #### Cmd: createMultiSignAccount _**详细描述: 根据多个账户的公钥创建多签账户，minSigns为多签账户创建交易时需要的最小签名数**_ @@ -988,7 +892,7 @@ _**详细描述: 根据多个账户的公钥创建多签账户，minSigns为多 } ``` -### 1.18 离线创建设置别名交易 +### 1.19 离线创建设置别名交易 #### Cmd: createAliasTx _**详细描述: 离线创建设置别名交易**_ @@ -1030,7 +934,7 @@ _**详细描述: 离线创建设置别名交易**_ } ``` -### 1.19 多签账户离线创建设置别名交易 +### 1.20 多签账户离线创建设置别名交易 #### Cmd: createMultiSignAliasTx _**详细描述: 多签账户离线创建设置别名交易**_ @@ -1074,7 +978,7 @@ _**详细描述: 多签账户离线创建设置别名交易**_ } ``` -### 1.20 根据私钥获取账户地址格式 +### 1.21 根据私钥获取账户地址格式 #### Cmd: getAddressByPriKey _**详细描述: 根据私钥获取账户地址格式**_ @@ -1111,7 +1015,7 @@ _**详细描述: 根据私钥获取账户地址格式**_ } ``` -### 1.21 查询钱包内创建的账户列表 +### 1.22 查询钱包内创建的账户列表 #### Cmd: getAddressList _**详细描述: 查询钱包内创建的账户列表**_ @@ -1121,31 +1025,111 @@ _**详细描述: 查询钱包内创建的账户列表**_ #### 返回值 无返回值 #### Example request data: -``` -{ - "jsonrpc":"2.0", - "method":"getAddressList", - "params":[], - "id":1234 -} -``` +无 #### Example response data: -``` -{ - "jsonrpc": "2.0", - "id": "1234", - "result": [ - "tNULSeBaMhmHrnX4XJHbZxR4ypRun52s1uYnJB", - "tNULSeBaMuJrfBuCWJn9t3WeKo8VGPvScftivi", - "tNULSeBaMnrTyBNxbAnPgyihYLennQcYjh835H", - "tNULSeBaMfRZXhSuWtka6RqmGhS8cfYk7wEtY3", - "tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe" - ] -} -``` +略 + +### 1.23 明文私钥摘要签名消息 +#### Cmd: signMessage +_**详细描述: 明文私钥摘要签名消息**_ +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ---------- |:------:| ---- |:----:| +| message | string | 消息 | 是 | +| privateKey | string | 私钥 | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| --- |:----:| ---- | +| N/A | void | 消息签名 | +#### Example request data: +无 + +#### Example response data: +略 +### 1.24 验证消息签名 +#### Cmd: verifySignedMessage +_**详细描述: 验证消息签名**_ + +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------- |:------:| ---- |:----:| +| message | string | 消息 | 是 | +| signature | string | 消息签名 | 是 | +| publicKey | string | 公钥 | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| --- |:-------:| ------ | +| | boolean | 验证是否成功 | +#### Example request data: +无 + +#### Example response data: +略 + +### 1.25 根据私钥获取公钥 +#### Cmd: getPubKeyByPriKey +_**详细描述: 根据私钥获取公钥**_ + +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------ |:----------:| ------ |:----:| +| 原始私钥 | prikeyform | 私钥表单 | 是 | +|         priKey | string | 账户明文私钥 | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| --- |:----:| ----------- | +| N/A | void | 公钥的HEX编码字符串 | +#### Example request data: +无 + +#### Example response data: +略 + +### 1.26 是否锁定账户 +#### Cmd: isBlockAccount +_**详细描述: 是否锁定账户**_ + +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------- |:------:| ---- |:----:| +| chainId | int | 链ID | 是 | +| address | string | 账户地址 | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| ----- |:------:| ---- | +| value | string | 是否锁定 | +#### Example request data: +无 + +#### Example response data: +略 + +### 1.27 查询锁定账户信息 +#### Cmd: getBlockAccountInfo +_**详细描述: 查询锁定账户信息**_ + +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------- |:------:| ---- |:----:| +| chainId | int | 链ID | 是 | +| address | string | 账户地址 | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| --- |:---------------:| --------- | +| 返回值 | accountblockdto | 返回一个Map对象 | +#### Example request data: +无 + +#### Example response data: +略 ### 2.1 获取本节点的网络状态信息 #### Cmd: getNetworkInfo @@ -1159,31 +1143,10 @@ _**详细描述: 获取本节点的网络状态信息**_ | --- |:-----------:| ------ | | 返回值 | networkinfo | 返回网络状态 | #### Example request data: -``` -{ -"jsonrpc":"2.0", -"method":"getNetworkInfo", -"params":[], -"id":1234 -} -``` +无 #### Example response data: -``` -{ - "jsonrpc": "2.0", - "id": "1234", - "result": { - "localBestHeight": 4624308, - "netBestHeight": 4624309, - "timeOffset": -17, - "inCount": 0, - "outCount": 12 - } -} -``` - - +略 ### 2.2 根据区块高度查询区块头 #### Cmd: getHeaderByHeight @@ -1202,6 +1165,7 @@ _**详细描述: 根据区块高度查询区块头**_ | preHash | string | 上一个区块的hash值 | | merkleHash | string | 梅克尔hash | | time | string | 区块生成时间 | +| timestamp | long | 区块生成时间戳 | | height | long | 区块高度 | | txCount | int | 区块打包交易数量 | | blockSignature | string | 签名Hex.encode(byte[]) | @@ -1210,6 +1174,7 @@ _**详细描述: 根据区块高度查询区块头**_ | roundIndex | long | 共识轮次 | | consensusMemberCount | int | 参与共识成员数量 | | roundStartTime | string | 当前共识轮开始时间 | +| roundStartTimestamp | long | 当前共识轮开始时间戳 | | packingIndexOfRound | int | 当前轮次打包出块的名次 | | mainVersion | short | 主网当前生效的版本 | | blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1270,6 +1235,7 @@ _**详细描述: 根据区块hash查询区块头**_ | preHash | string | 上一个区块的hash值 | | merkleHash | string | 梅克尔hash | | time | string | 区块生成时间 | +| timestamp | long | 区块生成时间戳 | | height | long | 区块高度 | | txCount | int | 区块打包交易数量 | | blockSignature | string | 签名Hex.encode(byte[]) | @@ -1278,6 +1244,7 @@ _**详细描述: 根据区块hash查询区块头**_ | roundIndex | long | 共识轮次 | | consensusMemberCount | int | 参与共识成员数量 | | roundStartTime | string | 当前共识轮开始时间 | +| roundStartTimestamp | long | 当前共识轮开始时间戳 | | packingIndexOfRound | int | 当前轮次打包出块的名次 | | mainVersion | short | 主网当前生效的版本 | | blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1337,6 +1304,7 @@ _**详细描述: 查询最新区块头信息**_ | preHash | string | 上一个区块的hash值 | | merkleHash | string | 梅克尔hash | | time | string | 区块生成时间 | +| timestamp | long | 区块生成时间戳 | | height | long | 区块高度 | | txCount | int | 区块打包交易数量 | | blockSignature | string | 签名Hex.encode(byte[]) | @@ -1345,6 +1313,7 @@ _**详细描述: 查询最新区块头信息**_ | roundIndex | long | 共识轮次 | | consensusMemberCount | int | 参与共识成员数量 | | roundStartTime | string | 当前共识轮开始时间 | +| roundStartTimestamp | long | 当前共识轮开始时间戳 | | packingIndexOfRound | int | 当前轮次打包出块的名次 | | mainVersion | short | 主网当前生效的版本 | | blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1405,6 +1374,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         preHash | string | 上一个区块的hash值 | |         merkleHash | string | 梅克尔hash | |         time | string | 区块生成时间 | +|         timestamp | long | 区块生成时间戳 | |         height | long | 区块高度 | |         txCount | int | 区块打包交易数量 | |         blockSignature | string | 签名Hex.encode(byte[]) | @@ -1413,6 +1383,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         roundIndex | long | 共识轮次 | |         consensusMemberCount | int | 参与共识成员数量 | |         roundStartTime | string | 当前共识轮开始时间 | +|         roundStartTimestamp | long | 当前共识轮开始时间戳 | |         packingIndexOfRound | int | 当前轮次打包出块的名次 | |         mainVersion | short | 主网当前生效的版本 | |         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1524,6 +1495,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         preHash | string | 上一个区块的hash值 | |         merkleHash | string | 梅克尔hash | |         time | string | 区块生成时间 | +|         timestamp | long | 区块生成时间戳 | |         height | long | 区块高度 | |         txCount | int | 区块打包交易数量 | |         blockSignature | string | 签名Hex.encode(byte[]) | @@ -1532,6 +1504,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         roundIndex | long | 共识轮次 | |         consensusMemberCount | int | 参与共识成员数量 | |         roundStartTime | string | 当前共识轮开始时间 | +|         roundStartTimestamp | long | 当前共识轮开始时间戳 | |         packingIndexOfRound | int | 当前轮次打包出块的名次 | |         mainVersion | short | 主网当前生效的版本 | |         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1643,6 +1616,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         preHash | string | 上一个区块的hash值 | |         merkleHash | string | 梅克尔hash | |         time | string | 区块生成时间 | +|         timestamp | long | 区块生成时间戳 | |         height | long | 区块高度 | |         txCount | int | 区块打包交易数量 | |         blockSignature | string | 签名Hex.encode(byte[]) | @@ -1651,6 +1625,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         roundIndex | long | 共识轮次 | |         consensusMemberCount | int | 参与共识成员数量 | |         roundStartTime | string | 当前共识轮开始时间 | +|         roundStartTimestamp | long | 当前共识轮开始时间戳 | |         packingIndexOfRound | int | 当前轮次打包出块的名次 | |         mainVersion | short | 主网当前生效的版本 | |         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1894,7 +1869,7 @@ _**详细描述: 根据hash获取交易**_ "time" : "2019-12-18 14:35:04.004", "blockHeight" : 172, "blockHash" : "d7412d925da4eef1f1d7fdf2e19c24d1d2616e9ae3d75b405ee9e69b51bf0491", - "remark" : "call contract test", + "remark" : "call contract test - 空气币转账", "transactionSignature" : "2103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e3473045022100fa7c1987316b16fbc156173d2419591e4bc0df15835c096eae5d38f24c34ae7802201ca68cf83b13811f5e4cbd09bd03a53394ef0e90d20cd4a1bb43eb13a6fa441e", "txDataHex" : "020001f7ec6473df12e751d64cf20a8baa7edd50810f810200029fef190beb3651234855ec4348471180ae1881b1000000000000000000000000000000000000000000000000000000000000000080841e00000000001900000000000000087472616e7366657200020126744e554c536542614d72624d52694641556565417436737762347856424e79693831594c32340103383030", "status" : 1, @@ -2067,13 +2042,14 @@ _**详细描述: 广播离线组装的交易(不验证),成功返回true,失败 } ``` -### 3.6 单笔链内转账 -#### Cmd: transfer -_**详细描述: 发起单账户单资产的转账交易**_ +### 3.6 单笔转账 +#### Cmd: transferOtherChainAsset +_**详细描述: 发起单账户单资产的转账交易,转账资产为链内的其他平行链资产**_ #### 参数列表 | 参数名 | 参数类型 | 参数描述 | 是否必填 | | ------------ |:------:| ------ |:----:| +| chainId | int | 链id | 是 | | assetChainId | int | 资产链id | 是 | | assetId | int | 资产id | 是 | | address | string | 转出账户地址 | 是 | @@ -2087,36 +2063,18 @@ _**详细描述: 发起单账户单资产的转账交易**_ | ---- |:------:| ------ | | hash | string | 交易hash | #### Example request data: - -```json -{ - "jsonrpc" : "2.0", - "method" : "transfer", - "params" : [ 2, 1, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "tNULSeBaMhcccH1KeXhMpH5y3pvtRzatAiuMJk", "nuls123456", "10000000000000", "transfer tx" ], - "id" : 1234 -} -``` +无 #### Example response data: +略 -```json -{ - "jsonrpc" : "2.0", - "id" : "1234", - "result" : { - "hash" : "40acabd7e7b7643aa545f2b74d09f8d65eecf885919d968d263a7a24255f8698" - } -} -``` - -### 3.7 单笔转账 -#### Cmd: transferOtherChainAsset -_**详细描述: 发起单账户单资产的转账交易,转账资产为链内的其他平行链资产**_ +### 3.7 单笔跨链转账 +#### Cmd: crossTransfer +_**详细描述: 发起单账户单资产的跨链转账交易**_ #### 参数列表 | 参数名 | 参数类型 | 参数描述 | 是否必填 | | ------------ |:------:| ------ |:----:| -| chainId | int | 链id | 是 | | assetChainId | int | 资产链id | 是 | | assetId | int | 资产id | 是 | | address | string | 转出账户地址 | 是 | @@ -2130,29 +2088,14 @@ _**详细描述: 发起单账户单资产的转账交易,转账资产为链内 | ---- |:------:| ------ | | hash | string | 交易hash | #### Example request data: -``` -{ - "jsonrpc" : "2.0", - "method" : "transferOtherChainAsset", - "params" : [ 5, 1, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "tNULSeBaMhcccH1KeXhMpH5y3pvtRzatAiuMJk", "nuls123456", "10000000000000", "transfer tx" ], - "id" : 1234 -} -``` +无 #### Example response data: -``` -{ - "jsonrpc" : "2.0", - "id" : "1234", - "result" : { - "hash" : "40acabd7e7b7643aa545f2b74d09f8d65eecf885919d968d263a7a24255f8698" - } -} -``` +略 -### 3.8 单笔跨链转账 -#### Cmd: crossTransfer -_**详细描述: 发起单账户单资产的跨链转账交易**_ +### 3.8 单笔链内转账 +#### Cmd: transfer +_**详细描述: 发起单账户单资产的转账交易**_ #### 参数列表 | 参数名 | 参数类型 | 参数描述 | 是否必填 | @@ -2170,17 +2113,19 @@ _**详细描述: 发起单账户单资产的跨链转账交易**_ | ---- |:------:| ------ | | hash | string | 交易hash | #### Example request data: -``` + +```json { "jsonrpc" : "2.0", - "method" : "crossTransfer", - "params" : [ 2, 1, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "TNVTseBaMhcccH1KeXhMpH5y3pvtRzatAiuMJk", "nuls123456", "10000000000000", "cross transfer tx" ], + "method" : "transfer", + "params" : [ 2, 1, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "tNULSeBaMhcccH1KeXhMpH5y3pvtRzatAiuMJk", "nuls123456", "10000000000000", "transfer tx" ], "id" : 1234 } ``` #### Example response data: -``` + +```json { "jsonrpc" : "2.0", "id" : "1234", @@ -2190,29 +2135,28 @@ _**详细描述: 发起单账户单资产的跨链转账交易**_ } ``` - - ### 3.9 离线组装转账交易 #### Cmd: createTransferTxOffline _**详细描述: 根据inputs和outputs离线组装转账交易，用于单账户或多账户的转账交易。交易手续费为inputs里本链主资产金额总和，减去outputs里本链主资产总和**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :-------------: | ---------------- | :------: | -|         inputs | list<object> | 转账交易输入列表 | 是 | -|                 address | string | 账户地址 | 是 | -|                 assetChainId | int | 资产的链id | 是 | -|                 assetId | int | 资产id | 是 | -|                 amount | biginteger | 资产金额 | 是 | -|                 nonce | string | 资产nonce值 | 是 | -|         outputs | list<object> | 转账交易输出列表 | 是 | -|                 address | string | 账户地址 | 是 | -|                 assetChainId | int | 资产的链id | 是 | -|                 assetId | int | 资产id | 是 | -|                 amount | biginteger | 资产金额 | 是 | -|                 lockTime | long | 锁定时间 | 是 | -|         time | long | 创建时间 | 否 | -|         remark | string | 交易备注 | 否 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:| +| transferDto | transferdto | 转账交易表单 | 是 | +|         inputs | list<object> | 转账交易输入列表 | 是 | +|                 address | string | 账户地址 | 是 | +|                 assetChainId | int | 资产的链id | 是 | +|                 assetId | int | 资产id | 是 | +|                 amount | biginteger | 资产金额 | 是 | +|                 nonce | string | 资产nonce值 | 是 | +|         outputs | list<object> | 转账交易输出列表 | 是 | +|                 address | string | 账户地址 | 是 | +|                 assetChainId | int | 资产的链id | 是 | +|                 assetId | int | 资产id | 是 | +|                 amount | biginteger | 资产金额 | 是 | +|                 lockTime | long | 锁定时间 | 是 | +|         time | long | 创建时间 | 否 | +|         remark | string | 交易备注 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2232,7 +2176,7 @@ _**详细描述: 根据inputs和outputs离线组装转账交易，用于单账 "amount" : "100001000000", "nonce" : "0000000000000000" } ], [ { - "address" : "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", + "address" : "tNULSeBaMhcccH1KeXhMpH5y3pvtRzatAiuMJk", "assetChainId" : 2, "assetId" : 1, "amount" : "100000000000", @@ -2260,22 +2204,23 @@ _**详细描述: 根据inputs和outputs离线组装转账交易，用于单账 _**详细描述: 根据inputs和outputs离线组装跨链转账交易，用于单账户或多账户的跨链转账交易。交易手续费为inputs里本链主资产金额总和，减去outputs里本链主资产总和，加上跨链转账手续费（NULS）**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :-------------: | ---------------- | :------: | -|         inputs | list<object> | 转账交易输入列表 | 是 | -|                 address | string | 账户地址 | 是 | -|                 assetChainId | int | 资产的链id | 是 | -|                 assetId | int | 资产id | 是 | -|                 amount | biginteger | 资产金额 | 是 | -|                 nonce | string | 资产nonce值 | 是 | -|         outputs | list<object> | 转账交易输出列表 | 是 | -|                 address | string | 账户地址 | 是 | -|                 assetChainId | int | 资产的链id | 是 | -|                 assetId | int | 资产id | 是 | -|                 amount | biginteger | 资产金额 | 是 | -|                 lockTime | long | 锁定时间 | 是 | -|         time | long | 创建时间 | 否 | -|         remark | string | 交易备注 | 否 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:| +| transferDto | transferdto | 转账交易表单 | 是 | +|         inputs | list<object> | 转账交易输入列表 | 是 | +|                 address | string | 账户地址 | 是 | +|                 assetChainId | int | 资产的链id | 是 | +|                 assetId | int | 资产id | 是 | +|                 amount | biginteger | 资产金额 | 是 | +|                 nonce | string | 资产nonce值 | 是 | +|         outputs | list<object> | 转账交易输出列表 | 是 | +|                 address | string | 账户地址 | 是 | +|                 assetChainId | int | 资产的链id | 是 | +|                 assetId | int | 资产id | 是 | +|                 amount | biginteger | 资产金额 | 是 | +|                 lockTime | long | 锁定时间 | 是 | +|         time | long | 创建时间 | 否 | +|         remark | string | 交易备注 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2283,53 +2228,24 @@ _**详细描述: 根据inputs和outputs离线组装跨链转账交易，用于 | hash | string | 交易hash | | txHex | string | 交易序列化16进制字符串 | #### Example request data: -``` -{ - "jsonrpc" : "2.0", - "method" : "createCrossTxOffline", - "params" : [ [ { - "address" : "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", - "assetChainId" : 2, - "assetId" : 1, - "amount" : "100001000000", - "nonce" : "0000000000000000" - } ], [ { - "address" : "TNVTeBaMhcccH1KeXhMpH5y3pvtRzatAiuMJk", - "assetChainId" : 2, - "assetId" : 1, - "amount" : "100000000000", - "lockTime" : 0 - } ], "remark" ], - "id" : 1234 -} -``` +无 #### Example response data: -``` -{ - "jsonrpc" : "2.0", - "id" : "1234", - "result" : { - "txHex" : "0200b67f2d5d0672656d61726b008c01170200012a9af4ee49f4cb1ee84eafd42aec41bc04b28f7b02000100402a8648170000000000000000000000000000000000000000000000000000000800000000000000000001170200012a9af4ee49f4cb1ee84eafd42aec41bc04b28f7b0200010000e8764817000000000000000000000000000000000000000000000000000000000000000000000000", - "hash" : "748184df91eda8d09be76e075d553313434c56bfeec3d449abc99ba6c430c00c" - } -} -``` - - +略 ### 3.11 计算离线创建转账交易所需手续费 #### Cmd: calcTransferTxFee -_**详细描述: 计算离线创建转账交易所需手续费，其中手续费单价不填写，默认为0.001NULS**_ +_**详细描述: 计算离线创建转账交易所需手续费**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :--------: | ------------ | :------: | -|         addressCount | int | 转账地址数量 | 是 | -|         fromLength | int | 转账输入长度 | 是 | -|         toLength | int | 转账输出长度 | 是 | -|         remark | string | 交易备注 | 是 | -|         price | biginteger | 手续费单价 | 否 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------ |:----------------:| ------- |:----:| +| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 | +|         addressCount | int | 转账地址数量 | 是 | +|         fromLength | int | 转账输入长度 | 是 | +|         toLength | int | 转账输出长度 | 是 | +|         remark | string | 交易备注 | 是 | +|         price | biginteger | 手续费单价 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2363,60 +2279,48 @@ _**详细描述: 计算离线创建转账交易所需手续费，其中手续费 _**详细描述: 计算离线创建跨链转账交易所需手续费**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ------------ | :------: | -|         addressCount | int | 转账地址数量 | 是 | -|         fromLength | int | 转账输入长度 | 是 | -|         toLength | int | 转账输出长度 | 是 | -|         remark | string | 交易备注 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------ |:----------------:| ------- |:----:| +| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 | +|         addressCount | int | 转账地址数量 | 是 | +|         fromLength | int | 转账输入长度 | 是 | +|         toLength | int | 转账输出长度 | 是 | +|         remark | string | 交易备注 | 是 | +|         price | biginteger | 手续费单价 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | | ----- |:------:| ----- | | value | string | 交易手续费 | #### Example request data: -``` -{ -"jsonrpc":"2.0", -"method":"calcCrossTxFee", -"params":[1, 1, 1,"remark"], -"id":1234 -} -``` +无 #### Example response data: -``` -{ - "jsonrpc": "2.0", - "id": "1234", - "result": { - "value": "1000000" - } -} -``` +略 ### 3.13 离线组装转账交易 #### Cmd: createMultiSignTransferTxOffline _**详细描述: 根据inputs和outputs离线组装转账交易，用于单账户或多账户的转账交易。交易手续费为inputs里本链主资产金额总和，减去outputs里本链主资产总和**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :-------------: | ---------------- | :------: | -|         pubKeys | list<string> | 公钥集合 | 是 | -|         minSigns | int | 最小签名数 | 是 | -|         inputs | list<object> | 转账交易输入列表 | 是 | -|                 address | string | 账户地址 | 是 | -|                 assetChainId | int | 资产的链id | 是 | -|                 assetId | int | 资产id | 是 | -|                 amount | biginteger | 资产金额 | 是 | -|                 nonce | string | 资产nonce值 | 是 | -|         outputs | list<object> | 转账交易输出列表 | 是 | -|                 address | string | 账户地址 | 是 | -|                 assetChainId | int | 资产的链id | 是 | -|                 assetId | int | 资产id | 是 | -|                 amount | biginteger | 资产金额 | 是 | -|                 lockTime | long | 锁定时间 | 是 | -|         remark | string | 交易备注 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------------------------------------------------------ |:--------------------:| -------- |:----:| +| transferDto | multisigntransferdto | 转账交易表单 | 是 | +|         pubKeys | list<string> | 公钥集合 | 是 | +|         minSigns | int | 最小签名数 | 是 | +|         inputs | list<object> | 转账交易输入列表 | 是 | +|                 address | string | 账户地址 | 是 | +|                 assetChainId | int | 资产的链id | 是 | +|                 assetId | int | 资产id | 是 | +|                 amount | biginteger | 资产金额 | 是 | +|                 nonce | string | 资产nonce值 | 是 | +|         outputs | list<object> | 转账交易输出列表 | 是 | +|                 address | string | 账户地址 | 是 | +|                 assetChainId | int | 资产的链id | 是 | +|                 assetId | int | 资产id | 是 | +|                 amount | biginteger | 资产金额 | 是 | +|                 lockTime | long | 锁定时间 | 是 | +|         remark | string | 交易备注 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2464,13 +2368,14 @@ _**详细描述: 根据inputs和outputs离线组装转账交易，用于单账 _**详细描述: 计算离线创建转账交易所需手续费**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ----------------------------------------------------------- | :--------: | -------------------- | :------: | -|         pubKeyCount | int | 多签地址对应公钥数量 | 是 | -|         fromLength | int | 转账输入长度 | 是 | -|         toLength | int | 转账输出长度 | 是 | -|         remark | string | 交易备注 | 是 | -|         price | biginteger | 手续费单价 | 否 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ----------------------------------------------------------- |:-------------------------:| ---------- |:----:| +| MultiSignTransferTxFeeDto | multisigntransfertxfeedto | 转账交易手续费 | 是 | +|         pubKeyCount | int | 多签地址对应公钥数量 | 是 | +|         fromLength | int | 转账输入长度 | 是 | +|         toLength | int | 转账输出长度 | 是 | +|         remark | string | 交易备注 | 是 | +|         price | biginteger | 手续费单价 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2501,7 +2406,7 @@ _**详细描述: 计算离线创建转账交易所需手续费**_ ### 4.1 发布合约 #### Cmd: contractCreate -_**详细描述: 发布智能合约**_ +_**详细描述: 发布合约**_ #### 参数列表 | 参数名 | 参数类型 | 参数描述 | 是否必填 | @@ -2527,7 +2432,7 @@ _**详细描述: 发布智能合约**_ { "jsonrpc" : "2.0", "method" : "contractCreate", - "params" : [ 2, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "nuls123456", "jsonrpc_nrc20", 20000, 30, "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86e5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b0404806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbeff", [ "io", "IO", 80000, 1 ], null ], + "params" : [ 2, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "nuls123456", "jsonrpc_nrc20", 20000, 30, "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", [ "io", "IO", 80000, 1 ], null ], "id" : 1234 } ``` @@ -2732,7 +2637,8 @@ _**详细描述: 获取账户地址的指定合约的token余额**_ | contractAddress | string | 合约地址 | | name | string | token名称 | | symbol | string | token符号 | -| amount | string | token数量 | +| amount | string | token可用数量 | +| lockAmount | string | token锁定数量 | | decimals | long | token支持的小数位数 | | blockHeight | long | 合约创建时的区块高度 | | status | int | 合约状态(0-不存在, 1-正常, 2-终止) | @@ -2785,6 +2691,7 @@ _**详细描述: 获取智能合约详细信息**_ | createTime | long | 合约创建时间（单位：秒） | | blockHeight | long | 合约创建时的区块高度 | | isDirectPayable | boolean | 是否接受直接转账 | +| directPayableByOtherAsset | boolean | 是否接受其他资产直接转账 | | tokenType | int | token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 | | isNrc20 | boolean | 是否是NRC20合约 | | nrc20TokenName | string | NRC20-token名称 | @@ -2803,6 +2710,7 @@ _**详细描述: 获取智能合约详细信息**_ |         view | boolean | 是否视图方法（调用此方法数据不上链） | |         event | boolean | 是否是事件 | |         payable | boolean | 是否是可接受主链资产转账的方法 | +|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 | |         jsonSerializable | boolean | 方法返回值是否JSON序列化 | #### Example request data: @@ -2883,7 +2791,25 @@ _**详细描述: 获取智能合约详细信息**_ "view" : false, "event" : false, "payable" : false - }, + }, { + "name" : "single", + "desc" : "() return String", + "args" : [ ], + "returnArg" : "String", + "view" : false, + "event" : false, + "payable" : false + }, { + "name" : "multy", + "desc" : "() return String", + "args" : [ ], + "returnArg" : "String", + "view" : false, + "event" : false, + "payable" : true + }, { + "name" : "multyForAddress", + "desc" : "(Address add1, BigInteger add1_na, Address add2, BigInteger add2_na, String add3ForString, BigInteger add3_na) return String", "args" : [ { "type" : "Address", "name" : "add1", @@ -3303,6 +3229,7 @@ _**详细描述: 获取合约代码构造函数**_ |         view | boolean | 是否视图方法（调用此方法数据不上链） | |         event | boolean | 是否是事件 | |         payable | boolean | 是否是可接受主链资产转账的方法 | +|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 | |         jsonSerializable | boolean | 方法返回值是否JSON序列化 | | isNrc20 | boolean | 是否是NRC20合约 | #### Example request data: @@ -3311,7 +3238,7 @@ _**详细描述: 获取合约代码构造函数**_ { "jsonrpc" : "2.0", "method" : "getContractConstructor", - "params" : [ 2, "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbac199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c223083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000" ], + "params" : [ 2, "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000" ], "id" : 1234 } ``` @@ -3378,6 +3305,7 @@ _**详细描述: 获取合约方法信息**_ | view | boolean | 是否视图方法（调用此方法数据不上链） | | event | boolean | 是否是事件 | | payable | boolean | 是否是可接受主链资产转账的方法 | +| payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 | | jsonSerializable | boolean | 方法返回值是否JSON序列化 | #### Example request data: @@ -3613,7 +3541,7 @@ _**详细描述: 估算发布合约交易的GAS**_ { "jsonrpc" : "2.0", "method" : "imputedContractCreateGas", - "params" : [ 2, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb90000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", [ "io", "IO", 80000, 1 ] ], + "params" : [ 2, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", [ "io", "IO", 80000, 1 ] ], "id" : 1234 } ``` @@ -3743,7 +3671,7 @@ _**详细描述: 离线 - 发布合约交易**_ { "jsonrpc" : "2.0", "method" : "contractCreateOffline", - "params" : [ 2, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "999999998523475", "9c0aea02bed90ddd", "off_nrc20", "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe27841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e03742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", 20245, [ "air", "AIR", 10000, 2 ], [ "String", "String", "BigInteger", "int" ], "offline create" ], + "params" : [ 2, "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "999999998523475", "9c0aea02bed90ddd", "off_nrc20", "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", 20245, [ "air", "AIR", 10000, 2 ], [ "String", "String", "BigInteger", "int" ], "offline create" ], "id" : 1234 } ``` @@ -3755,7 +3683,7 @@ _**详细描述: 离线 - 发布合约交易**_ "jsonrpc" : "2.0", "id" : "1234", "result" : { - "txHex" : "0f00212d375d0e6f66666c696e6520637265617465fd7a19020001f7ec6473df12e751d64cf20a8baa7edd50810f8102000219465936f10d20dd74de26ce391f9764acfcd445fd1a19504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1d8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000096f66665f6e72633230154f0000000000001900000000000000040103616972010341495201053130303030010132480117020001f7ec6473df12e751d64cf20a8baa7edd50810f81020001006d67120000000000000000000000000000000000000000000000000000000000089c0aea02bed90ddd000000", + "txHex" : "0f00212d375d0e6f66666c696e6520637265617465fd7a19020001f7ec6473df12e751d64cf20a8baa7edd50810f8102000219465936f10d20dd74de26ce391f9764acfcd445fd1a19504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000096f66665f6e72633230154f0000000000001900000000000000040103616972010341495201053130303030010132480117020001f7ec6473df12e751d64cf20a8baa7edd50810f81020001006d67120000000000000000000000000000000000000000000000000000000000089c0aea02bed90ddd000000", "contractAddress" : "tNULSeBaMxHqD1Vdcmyx4P43GMCPGcRiFzqjie", "hash" : "2ca7d4e9f2ffcb92e1d134ea4a544ffb947f4c9154ff73223834d87bba9734ba" } @@ -3951,15 +3879,16 @@ _**详细描述: 离线 - 从账户地址向合约地址转账(主链资产)的 _**详细描述: 创建共识节点**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ---------------------- | :------: | -| chainId | int | 链ID | 是 | -|         agentAddress | string | 节点地址 | 是 | -|         packingAddress | string | 节点出块地址 | 是 | -|         rewardAddress | string | 奖励地址，默认节点地址 | 否 | -|         commissionRate | int | 佣金比例 | 是 | -|         deposit | string | 抵押金额 | 是 | -|         password | string | 密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------------- |:---------------:| ----------- |:----:| +| chainId | int | 链ID | 是 | +| CreateAgentForm | createagentform | 创建共识节点表单 | 是 | +|         agentAddress | string | 节点地址 | 是 | +|         packingAddress | string | 节点出块地址 | 是 | +|         rewardAddress | string | 奖励地址，默认节点地址 | 否 | +|         commissionRate | int | 佣金比例 | 是 | +|         deposit | string | 抵押金额 | 是 | +|         password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -3991,11 +3920,12 @@ _**详细描述: 创建共识节点**_ _**详细描述: 注销共识节点**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :------: | ------------ | :------: | -| chainId | int | 链ID | 是 | -|         address | string | 共识节点地址 | 是 | -|         password | string | 密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:-------------:| -------- |:----:| +| chainId | int | 链ID | 是 | +| StopAgentForm | stopagentform | 注销共识节点表单 | 是 | +|         address | string | 共识节点地址 | 是 | +|         password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -4027,13 +3957,14 @@ _**详细描述: 注销共识节点**_ _**详细描述: 委托参与共识**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| --------------------------------------------------------- | :------: | ---------------- | :------: | -| chainId | int | 链ID | 是 | -|         address | string | 参与共识账户地址 | 是 | -|         agentHash | string | 共识节点hash | 是 | -|         deposit | string | 参与共识的金额 | 是 | -|         password | string | 密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------- |:-----------:| -------- |:----:| +| chainId | int | 链ID | 是 | +| DepositForm | depositform | 委托参与共识表单 | 是 | +|         address | string | 参与共识账户地址 | 是 | +|         agentHash | string | 共识节点hash | 是 | +|         deposit | string | 参与共识的金额 | 是 | +|         password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -4065,12 +3996,13 @@ _**详细描述: 委托参与共识**_ _**详细描述: 退出共识**_ #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :------: | -------------------- | :------: | -| chainId | int | 链ID | 是 | -|         address | string | 节点地址 | 是 | -|         txHash | string | 加入共识时的交易hash | 是 | -|         password | string | 密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:------------:| ------------ |:----:| +| chainId | int | 链ID | 是 | +| WithdrawForm | withdrawform | 退出共识表单 | 是 | +|         address | string | 节点地址 | 是 | +|         txHash | string | 加入共识时的交易hash | 是 | +|         password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -4368,10 +4300,6 @@ _**详细描述: 参与共识所需资产可通过查询链信息接口获取(ag } ``` -``` -createAgent -``` - ### 5.11 离线组装 - 注销共识节点 #### Cmd: stopAgentOffline _**详细描述: 组装交易的StopDepositDto信息，可通过查询节点的委托共识列表获取，input的nonce值可为空**_ @@ -4779,3 +4707,23 @@ _**详细描述: 离线组装 - 多签账户退出共识**_ } ``` +### 6.3 获取平行链资产信息 +#### Cmd: getCrossAssetInfo +_**详细描述: 获取平行链资产信息**_ + +#### 参数列表 +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------- |:----:| ----- |:----:| +| chainId | int | 资产链ID | 是 | +| assetId | int | 资产ID | 是 | + +#### 返回值 +| 字段名 | 字段类型 | 参数描述 | +| --- |:----------------------:| ---- | +| 返回值 | crossassetregisterinfo | | +#### Example request data: +无 + +#### Example response data: +略 + diff --git a/module/nuls-api/documents/nuls-api_Postman_JSONRPC.json b/module/nuls-api/documents/nuls-api_Postman_JSONRPC.json index dd10c46fc4..90d64a7cbb 100644 --- a/module/nuls-api/documents/nuls-api_Postman_JSONRPC.json +++ b/module/nuls-api/documents/nuls-api_Postman_JSONRPC.json @@ -1 +1 @@ -{"info":{"_postman_id":"b622391c-b3a9-41cc-8427-0328dc4f6829","name":"nuls-api-JSONRPC","schema":"https://schema.getpostman.com/json/collection/v2.1.0/collection.json"},"item":[{"name":"获取本链相关信息,其中共识资产为本链创建共识节点交易和创建委托共识交易时，需要用到的资产 - info","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"info\",\n\"params\":[],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ------------ |\n| chainId | string | 本链的ID |\n| assetId | string | 本链默认主资产的ID |\n| inflationAmount | string | 本链默认主资产的初始数量 |\n| agentChainId | string | 本链共识资产的链ID |\n| agentAssetId | string | 本链共识资产的ID |\n| addressPrefix | string | 本链地址前缀 |\n| symbol | string | 本链主资产符号 |\n"},"response":[]},{"name":"批量创建账户 - createAccount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAccount\",\n\"params\":[chainId, count, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| count | int | 创建数量 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| -------- |\n| 返回值 | list<string> | 返回账户地址集合 |\n"},"response":[]},{"name":"修改账户密码 - updatePassword","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"updatePassword\",\n\"params\":[chainId, address, oldPassword, newPassword],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| oldPassword | string | 原密码 | 是 |\n| newPassword | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否修改成功 |\n"},"response":[]},{"name":"导出账户私钥 - getPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getPriKey\",\n\"params\":[chainId, address, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 私钥 |\n"},"response":[]},{"name":"根据私钥导入账户 - importPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"importPriKey\",\n\"params\":[chainId, priKey, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| priKey | string | 账户明文私钥 | 是 |\n| password | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keystore导入账户 - importKeystore","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"importKeystore\",\n\"params\":[chainId, , password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| keyStoreJson | map | keyStoreJson | 是 |\n| password | string | keystore密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"账户备份，导出账户keystore信息 - exportKeystore","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"exportKeystore\",\n\"params\":[chainId, address, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| -------- |\n| result | string | keystore |\n"},"response":[]},{"name":"查询账户余额 - getAccountBalance","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAccountBalance\",\n\"params\":[chainId, assetChainId, assetId, address],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| assetChainId | int | 资产的链ID | 是 |\n| assetId | int | 资产ID | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------- |:------:| ------------------------- |\n| totalBalance | string | 总余额 |\n| balance | string | 可用余额 |\n| timeLock | string | 时间锁定金额 |\n| consensusLock | string | 共识锁定金额 |\n| freeze | string | 总锁定余额 |\n| nonce | string | 账户资产nonce值 |\n| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 |\n"},"response":[]},{"name":"设置账户别名 - setAlias","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"setAlias\",\n\"params\":[chainId, address, alias, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| alias | string | 别名 | 是 |\n| password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----------- |\n| value | string | 设置别名交易的hash |\n"},"response":[]},{"name":"验证地址是否正确 - validateAddress","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateAddress\",\n\"params\":[chainId, address],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------- |\n| value | string | boolean |\n"},"response":[]},{"name":"根据账户公钥生成账户地址 - getAddressByPublicKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAddressByPublicKey\",\n\"params\":[chainId, publicKey],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| publicKey | string | 账户公钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:------:| ---- |\n| address | string | 账户地址 |\n"},"response":[]},{"name":"离线 - 批量创建账户 - createAccountOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAccountOffline\",\n\"params\":[chainId, count, prefix, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| count | int | 创建数量 | 是 |\n| prefix | string | 地址前缀 | 否 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------- |:------:| ------ |\n| address | string | 账户地址 |\n| pubKey | string | 公钥 |\n| prikey | string | 明文私钥 |\n| encryptedPrivateKey | string | 加密后的私钥 |\n"},"response":[]},{"name":"离线获取账户明文私钥 - getPriKeyOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getPriKeyOffline\",\n\"params\":[chainId, address, encryptedPrivateKey, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| encryptedPrivateKey | string | 账户密文私钥 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 明文私钥 |\n"},"response":[]},{"name":"离线修改账户密码 - resetPasswordOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"resetPasswordOffline\",\n\"params\":[chainId, address, encryptedPrivateKey, oldPassword, newPassword],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| encryptedPrivateKey | string | 账户密文私钥 | 是 |\n| oldPassword | string | 原密码 | 是 |\n| newPassword | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---------- |\n| value | string | 重置密码后的加密私钥 |\n"},"response":[]},{"name":"多账户摘要签名 - multiSign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSign\",\n\"params\":[chainId, address, priKey, encryptedPrivateKey, password, txHex],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------- |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| signDtoList | list | 摘要签名表单 | 是 |\n|         address | string | 地址 | 是 |\n|         priKey | string | 明文私钥 | 否 |\n|         encryptedPrivateKey | string | 加密私钥 | 否 |\n|         password | string | 密码 | 否 |\n| txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"明文私钥摘要签名 - priKeySign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"priKeySign\",\n\"params\":[chainId, txHex, address, privateKey],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------- |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| txHex | string | 交易序列化16进制字符串 | 是 |\n| address | string | 账户地址 | 是 |\n| privateKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"密文私钥摘要签名 - encryptedPriKeySign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"encryptedPriKeySign\",\n\"params\":[chainId, txHex, address, encryptedPrivateKey, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------- |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| txHex | string | 交易序列化16进制字符串 | 是 |\n| address | string | 账户地址 | 是 |\n| encryptedPrivateKey | string | 账户密文私钥 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"创建多签账户 - createMultiSignAccount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createMultiSignAccount\",\n\"params\":[pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:---------------:| ------ |:----:|\n| pubKeys | list<string> | 账户公钥集合 | 是 |\n| minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 账户的地址 |\n"},"response":[]},{"name":"离线创建设置别名交易 - createAliasTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAliasTx\",\n\"params\":[address, alias, nonce, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:--------:| -------- |:----:|\n| 创建别名交易 | aliasdto | 创建别名交易表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"多签账户离线创建设置别名交易 - createMultiSignAliasTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createMultiSignAliasTx\",\n\"params\":[address, alias, nonce, remark, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------------:| -------- |:----:|\n| 多签账户离线创建设置别名交易 | multisignaliasdto | 创建别名交易表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"根据私钥获取账户地址格式 - getAddressByPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAddressByPriKey\",\n\"params\":[priKey],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------:| ------ |:----:|\n| 原始私钥 | prikeyform | 私钥表单 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"查询钱包内创建的账户列表 - getAddressList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAddressList\",\n\"params\":[],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n无返回值\n"},"response":[]},{"name":"获取本节点的网络状态信息 - getNetworkInfo","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getNetworkInfo\",\n\"params\":[],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:-----------:| ------ |\n| 返回值 | networkinfo | 返回网络状态 |\n"},"response":[]},{"name":"根据区块高度查询区块头 - getHeaderByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getHeaderByHeight\",\n\"params\":[chainId, height],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"根据区块hash查询区块头 - getHeaderByHash","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getHeaderByHash\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块头信息 - getBestBlockHeader","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBestBlockHeader\",\n\"params\":[chainId],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块 - getBestBlock","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBestBlock\",\n\"params\":[chainId],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块 - getBlockByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockByHeight\",\n\"params\":[chainId, height],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块hash查询区块 - getBlockByHash","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockByHash\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块序列化字符串 - getBlockSerializationByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockSerializationByHeight\",\n\"params\":[chainId, height],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"根据区块hash查询区块序列化字符串 - getBlockSerializationByHash","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockSerializationByHash\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"获取最新主链高度 - getLatestHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getLatestHeight\",\n\"params\":[chainId],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:----:| -------- |\n| 返回值 | long | 获取最新主链高度 |\n"},"response":[]},{"name":"根据hash获取交易 - getTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getTx\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链id | 是 |\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| hash | string | 交易的hash值 |\n| type | int | 交易类型 |\n| time | string | 交易时间 |\n| timestamp | long | 交易时间戳 |\n| blockHeight | long | 区块高度 |\n| blockHash | string | 区块hash |\n| remark | string | 交易备注 |\n| transactionSignature | string | 交易签名 |\n| txDataHex | string | 交易业务数据序列化字符串 |\n| status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n| size | int | 交易大小 |\n| inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n| from | list<object> | 输入 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|         locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n| to | list<object> | 输出 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"验证交易 - validateTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateTx\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| -------- |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"广播交易 - broadcastTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"broadcastTx\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证合约) - broadcastTxWithNoContractValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"broadcastTxWithNoContractValidation\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证) - broadcastTxWithoutAnyValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"broadcastTxWithoutAnyValidation\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔链内转账 - transfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transfer\",\n\"params\":[assetChainId, assetId, address, toAddress, password, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| assetChainId | int | 资产链id | 是 |\n| assetId | int | 资产id | 是 |\n| address | string | 转出账户地址 | 是 |\n| toAddress | string | 转入账户地址 | 是 |\n| password | string | 转出账户密码 | 是 |\n| amount | string | 转出金额 | 是 |\n| remark | string | 备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------ |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔转账 - transferOtherChainAsset","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transferOtherChainAsset\",\n\"params\":[chainId, assetChainId, assetId, address, toAddress, password, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| chainId | int | 链id | 是 |\n| assetChainId | int | 资产链id | 是 |\n| assetId | int | 资产id | 是 |\n| address | string | 转出账户地址 | 是 |\n| toAddress | string | 转入账户地址 | 是 |\n| password | string | 转出账户密码 | 是 |\n| amount | string | 转出金额 | 是 |\n| remark | string | 备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------ |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔跨链转账 - crossTransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"crossTransfer\",\n\"params\":[assetChainId, assetId, address, toAddress, password, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| assetChainId | int | 资产链id | 是 |\n| assetId | int | 资产id | 是 |\n| address | string | 转出账户地址 | 是 |\n| toAddress | string | 转入账户地址 | 是 |\n| password | string | 转出账户密码 | 是 |\n| amount | string | 转出金额 | 是 |\n| remark | string | 备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------ |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"离线组装转账交易 - createTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createTransferTxOffline\",\n\"params\":[inputs, outputs, time, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"离线组装转账交易 - createCrossTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createCrossTxOffline\",\n\"params\":[inputs, outputs, time, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建转账交易所需手续费 - calcTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"calcTransferTxFee\",\n\"params\":[addressCount, fromLength, toLength, remark, price],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"计算离线创建跨链转账交易所需手续费 - calcCrossTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"calcCrossTxFee\",\n\"params\":[addressCount, fromLength, toLength, remark, price],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"离线组装转账交易 - createMultiSignTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createMultiSignTransferTxOffline\",\n\"params\":[pubKeys, minSigns, inputs, outputs, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| -------- |:----:|\n| transferDto | multisigntransferdto | 转账交易表单 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         remark | string | 交易备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建转账交易所需手续费 - calcMultiSignTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"calcMultiSignTransferTxFee\",\n\"params\":[pubKeyCount, fromLength, toLength, remark, price],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-------------------------:| ---------- |:----:|\n| MultiSignTransferTxFeeDto | multisigntransfertxfeedto | 转账交易手续费 | 是 |\n|         pubKeyCount | int | 多签地址对应公钥数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"发布合约 - contractCreate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCreate\",\n\"params\":[chainId, sender, password, alias, gasLimit, price, contractCode, args, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:--------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| password | string | 账户密码 | 是 |\n| alias | string | 合约别名 | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| args | object[] | 参数列表 | 否 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------- |\n| txHash | string | 发布合约的交易hash |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"调用合约 - contractCall","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCall\",\n\"params\":[chainId, sender, password, value, gasLimit, price, contractAddress, methodName, methodDesc, args, remark, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| password | string | 调用者账户密码 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| remark | string | 交易备注 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 调用合约的交易hash |\n"},"response":[]},{"name":"删除合约 - contractDelete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractDelete\",\n\"params\":[chainId, sender, password, contractAddress, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| password | string | 交易账户密码 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 删除合约的交易hash |\n"},"response":[]},{"name":"合约token转账 - tokentransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"tokentransfer\",\n\"params\":[chainId, fromAddress, password, toAddress, contractAddress, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:----------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| password | string | 转出者账户密码 | 是 |\n| toAddress | string | 转入者账户地址 | 是 |\n| contractAddress | string | token合约地址 | 是 |\n| amount | biginteger | 转出的token资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"从账户地址向合约地址转账(主链资产)的合约交易 - transfer2contract","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transfer2contract\",\n\"params\":[chainId, fromAddress, password, toAddress, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:----------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| password | string | 转出者账户密码 | 是 |\n| toAddress | string | 转入者账户地址 | 是 |\n| amount | biginteger | 转出的主链资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"获取账户地址的指定合约的token余额 - getTokenBalance","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getTokenBalance\",\n\"params\":[chainId, contractAddress, address],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链id | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------------------- |\n| contractAddress | string | 合约地址 |\n| name | string | token名称 |\n| symbol | string | token符号 |\n| amount | string | token数量 |\n| decimals | long | token支持的小数位数 |\n| blockHeight | long | 合约创建时的区块高度 |\n| status | int | 合约状态(0-不存在, 1-正常, 2-终止) |\n"},"response":[]},{"name":"获取智能合约详细信息 - getContract","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContract\",\n\"params\":[chainId, contractAddress],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| contractAddress | string | 合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------------------------------ |\n| createTxHash | string | 发布合约的交易hash |\n| address | string | 合约地址 |\n| creater | string | 合约创建者地址 |\n| alias | string | 合约别名 |\n| createTime | long | 合约创建时间（单位：秒） |\n| blockHeight | long | 合约创建时的区块高度 |\n| isDirectPayable | boolean | 是否接受直接转账 |\n| tokenType | int | token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n| nrc20TokenName | string | NRC20-token名称 |\n| nrc20TokenSymbol | string | NRC20-token符号 |\n| decimals | long | NRC20-token支持的小数位数 |\n| totalSupply | string | NRC20-token发行总量 |\n| status | string | 合约状态（not_found, normal, stop） |\n| method | list<object> | 合约方法列表 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取智能合约执行结果 - getContractTxResult","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractTxResult\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| success | boolean | 合约执行是否成功 |\n| errorMessage | string | 执行失败信息 |\n| contractAddress | string | 合约地址 |\n| result | string | 合约执行结果 |\n| gasLimit | long | GAS限制 |\n| gasUsed | long | 已使用GAS |\n| price | long | GAS单价 |\n| totalFee | string | 交易总手续费 |\n| txSizeFee | string | 交易大小手续费 |\n| actualContractFee | string | 实际执行合约手续费 |\n| refundFee | string | 合约返回的手续费 |\n| value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n| stackTrace | string | 异常堆栈踪迹 |\n| transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         assetChainId | int | 转账金额资产链ID |\n|         assetId | int | 转账金额资产ID |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|                 assetChainId | int | 转入金额资产链ID |\n|                 assetId | int | 转入金额资产ID |\n|                 lockTime | long | 转入金额锁定时间 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| events | list<string> | 合约事件列表 |\n| debugEvents | list<string> | 调式合约事件列表 |\n| tokenTransfers | list<object> | 合约token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         value | string | 转账金额 |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n|         decimals | long | token支持的小数位数 |\n| token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         tokenId | string | tokenId |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n| invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|         cmdName | string | 命令名称 |\n|         args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|         cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|         newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n| contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n| remark | string | 备注 |\n"},"response":[]},{"name":"获取智能合约执行结果列表 - getContractTxResultList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractTxResultList\",\n\"params\":[chainId, hashList],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:---------------:| -------- |:----:|\n| chainId | int | 链ID | 是 |\n| hashList | list<string> | 交易hash列表 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| hash1 or hash2 or hash3... | object | 以交易hash列表中的hash值作为key，这里的key name是动态的 |\n|         success | boolean | 合约执行是否成功 |\n|         errorMessage | string | 执行失败信息 |\n|         contractAddress | string | 合约地址 |\n|         result | string | 合约执行结果 |\n|         gasLimit | long | GAS限制 |\n|         gasUsed | long | 已使用GAS |\n|         price | long | GAS单价 |\n|         totalFee | string | 交易总手续费 |\n|         txSizeFee | string | 交易大小手续费 |\n|         actualContractFee | string | 实际执行合约手续费 |\n|         refundFee | string | 合约返回的手续费 |\n|         value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n|         stackTrace | string | 异常堆栈踪迹 |\n|         transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 assetChainId | int | 转账金额资产链ID |\n|                 assetId | int | 转账金额资产ID |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                         assetChainId | int | 转入金额资产链ID |\n|                         assetId | int | 转入金额资产ID |\n|                         lockTime | long | 转入金额锁定时间 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         events | list<string> | 合约事件列表 |\n|         debugEvents | list<string> | 调式合约事件列表 |\n|         tokenTransfers | list<object> | 合约token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 value | string | 转账金额 |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|                 decimals | long | token支持的小数位数 |\n|         token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 tokenId | string | tokenId |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|         invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|                 cmdName | string | 命令名称 |\n|                 args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|                 cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|                 newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n|         contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n|         remark | string | 备注 |\n"},"response":[]},{"name":"获取合约代码构造函数 - getContractConstructor","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractConstructor\",\n\"params\":[chainId, contractCode],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| -------------------- |:----:|\n| chainId | int | 链ID | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------ |\n| constructor | object | 合约构造函数详情 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n"},"response":[]},{"name":"获取合约方法信息 - getContractMethod","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractMethod\",\n\"params\":[chainId, contractAddress, methodName, methodDesc],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 方法名称 | 是 |\n| methodDesc | string | 方法描述 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------- |:---------------:| ------------------ |\n| name | string | 方法名称 |\n| desc | string | 方法描述 |\n| args | list<object> | 方法参数列表 |\n|         type | string | 参数类型 |\n|         name | string | 参数名称 |\n|         required | boolean | 是否必填 |\n| returnArg | string | 返回值类型 |\n| view | boolean | 是否视图方法（调用此方法数据不上链） |\n| event | boolean | 是否是事件 |\n| payable | boolean | 是否是可接受主链资产转账的方法 |\n| jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取合约方法参数类型 - getContractMethodArgsTypes","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractMethodArgsTypes\",\n\"params\":[chainId, contractAddress, methodName, methodDesc],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 方法名称 | 是 |\n| methodDesc | string | 方法描述 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| ---- |\n| 返回值 | list<string> | |\n"},"response":[]},{"name":"验证发布合约 - validateContractCreate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateContractCreate\",\n\"params\":[chainId, sender, gasLimit, price, contractCode, args],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:--------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证调用合约 - validateContractCall","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateContractCall\",\n\"params\":[chainId, sender, value, gasLimit, price, contractAddress, methodName, methodDesc, args, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证删除合约 - validateContractDelete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateContractDelete\",\n\"params\":[chainId, sender, contractAddress],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"估算发布合约交易的GAS - imputedContractCreateGas","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"imputedContractCreateGas\",\n\"params\":[chainId, sender, contractCode, args],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:--------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"估算调用合约交易的GAS - imputedContractCallGas","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"imputedContractCallGas\",\n\"params\":[chainId, sender, value, contractAddress, methodName, methodDesc, args, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"调用合约不上链方法 - invokeView","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"invokeView\",\n\"params\":[chainId, contractAddress, methodName, methodDesc, args],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:--------:| -------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| --------- |\n| result | string | 视图方法的调用结果 |\n"},"response":[]},{"name":"离线 - 发布合约交易 - contractCreateOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCreateOffline\",\n\"params\":[chainId, sender, senderBalance, nonce, alias, contractCode, gasLimit, args, argsType, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------- |:----------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| senderBalance | biginteger | 账户余额 | 是 |\n| nonce | string | 账户nonce值 | 是 |\n| alias | string | 合约别名 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| args | object[] | 参数列表 | 否 |\n| argsType | string[] | 参数类型列表 | 否 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"离线 - 调用合约 - contractCallOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCallOffline\",\n\"params\":[chainId, sender, senderBalance, nonce, value, contractAddress, gasLimit, methodName, methodDesc, args, argsType, remark, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ----------------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| senderBalance | biginteger | 账户余额 | 是 |\n| nonce | string | 账户nonce值 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| argsType | string[] | 参数类型列表 | 否 |\n| remark | string | 交易备注 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线 - 删除合约 - contractDeleteOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractDeleteOffline\",\n\"params\":[chainId, sender, senderBalance, nonce, contractAddress, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:----------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| senderBalance | biginteger | 账户余额 | 是 |\n| nonce | string | 账户nonce值 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线 - 合约token转账 - tokentransferOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"tokentransferOffline\",\n\"params\":[chainId, fromAddress, senderBalance, nonce, toAddress, contractAddress, gasLimit, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:----------:| -------------- |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| senderBalance | biginteger | 转出者账户余额 | 是 |\n| nonce | string | 转出者账户nonce值 | 是 |\n| toAddress | string | 转入者账户地址 | 是 |\n| contractAddress | string | token合约地址 | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| amount | biginteger | 转出的token资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线 - 从账户地址向合约地址转账(主链资产)的合约交易 - transfer2contractOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transfer2contractOffline\",\n\"params\":[chainId, fromAddress, senderBalance, nonce, toAddress, gasLimit, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------- |:----------:| -------------- |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| senderBalance | biginteger | 转出者账户余额 | 是 |\n| nonce | string | 转出者账户nonce值 | 是 |\n| toAddress | string | 转入的合约地址 | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| amount | biginteger | 转出的主链资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"创建共识节点 - createAgent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAgent\",\n\"params\":[chainId, agentAddress, packingAddress, rewardAddress, commissionRate, deposit, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------------- |:---------------:| ----------- |:----:|\n| chainId | int | 链ID | 是 |\n| CreateAgentForm | createagentform | 创建共识节点表单 | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 奖励地址，默认节点地址 | 否 |\n|         commissionRate | int | 佣金比例 | 是 |\n|         deposit | string | 抵押金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"注销共识节点 - stopAgent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"stopAgent\",\n\"params\":[chainId, address, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------:| -------- |:----:|\n| chainId | int | 链ID | 是 |\n| StopAgentForm | stopagentform | 注销共识节点表单 | 是 |\n|         address | string | 共识节点地址 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"委托参与共识 - depositToAgent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"depositToAgent\",\n\"params\":[chainId, address, agentHash, deposit, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-----------:| -------- |:----:|\n| chainId | int | 链ID | 是 |\n| DepositForm | depositform | 委托参与共识表单 | 是 |\n|         address | string | 参与共识账户地址 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         deposit | string | 参与共识的金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"退出共识 - withdraw","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"withdraw\",\n\"params\":[chainId, address, txHash, password],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:------------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| WithdrawForm | withdrawform | 退出共识表单 | 是 |\n|         address | string | 节点地址 | 是 |\n|         txHash | string | 加入共识时的交易hash | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"查询节点的委托共识列表 - getDepositList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getDepositList\",\n\"params\":[chainId, agentHash],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ------------- |:----:|\n| chainId | int | 链ID | 是 |\n| agentHash | string | 创建共识节点的交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----------- |:------:| --------- |\n| deposit | string | 委托金额 |\n| agentHash | string | 节点hash |\n| address | string | 账户地址 |\n| time | long | 委托时间 |\n| txHash | string | 委托交易hash |\n| blockHeight | long | 委托时的区块高度 |\n| delHeight | long | 退出委托的区块高度 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数生成一个随机种子并返回 - getRandomSeedByCount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomSeedByCount\",\n\"params\":[chainId, height, count, algorithm],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ------------------------- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 最大高度 | 是 |\n| count | int | 原始种子个数 | 是 |\n| algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据高度区间生成一个随机种子并返回 - getRandomSeedByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomSeedByHeight\",\n\"params\":[chainId, startHeight, endHeight, algorithm],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:------:| ------------------------- |:----:|\n| chainId | int | 链ID | 是 |\n| startHeight | long | 起始高度 | 是 |\n| endHeight | long | 截止高度 | 是 |\n| algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数查找原始种子列表并返回 - getRandomRawSeedsByCount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomRawSeedsByCount\",\n\"params\":[chainId, height, count],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 最大高度 | 是 |\n| count | int | 原始种子个数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"根据高度区间查找原始种子列表并返回 - getRandomRawSeedsByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomRawSeedsByHeight\",\n\"params\":[chainId, startHeight, endHeight],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| startHeight | long | 起始高度 | 是 |\n| endHeight | long | 截止高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"离线组装 - 创建共识节点 - createAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAgentOffline\",\n\"params\":[chainId, agentAddress, packingAddress, rewardAddress, commissionRate, deposit, input],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:------------:| ---------- |:----:|\n| chainId | int | 链ID | 是 |\n| ConsensusDto | consensusdto | 离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 注销共识节点 - stopAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"stopAgentOffline\",\n\"params\":[chainId, agentHash, agentAddress, deposit, price, depositList],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:----------------:| ----------- |:----:|\n| chainId | int | 链ID | 是 |\n| StopConsensusDto | stopconsensusdto | 离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 委托参与共识 - depositToAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"depositToAgentOffline\",\n\"params\":[chainId, address, deposit, agentHash, input],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:----------:| ---------- |:----:|\n| chainId | int | 链ID | 是 |\n| DepositDto | depositdto | 离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 退出共识 - withdrawOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"withdrawOffline\",\n\"params\":[chainId, address, depositHash, price, input],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-----------:| ----------- |:----:|\n| chainId | int | 链ID | 是 |\n| WithDrawDto | withdrawdto | 离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户创建共识节点 - multiSignCreateAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignCreateAgentOffline\",\n\"params\":[chainId, agentAddress, packingAddress, rewardAddress, commissionRate, deposit, input, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------------:| -------------- |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignConsensusDto | multisignconsensusdto | 多签账户离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户注销共识节点 - multiSignStopAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignStopAgentOffline\",\n\"params\":[chainId, agentHash, agentAddress, deposit, price, depositList, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:-------------------------:| -------------- |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignStopConsensusDto | multisignstopconsensusdto | 多签账户离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户委托参与共识 - multiSignDepositToAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignDepositToAgentOffline\",\n\"params\":[chainId, address, deposit, agentHash, input, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-------------------:| -------------- |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignDepositDto | multisigndepositdto | 多签账户离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户退出共识 - multiSignWithdrawOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignWithdrawOffline\",\n\"params\":[chainId, address, depositHash, price, input, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"http://localhost:18004/jsonrpc","protocol":"http","host":["localhost"],"port":"18004","path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignWithDrawDto | multisignwithdrawdto | 多签账户离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]}]} \ No newline at end of file +{"info":{"_postman_id":"6743e83e-2691-466b-b659-9e7ab157c747","name":"nuls-api-JSONRPC","schema":"https://schema.getpostman.com/json/collection/v2.1.0/collection.json"},"item":[{"name":"获取本链相关信息,其中共识资产为本链创建共识节点交易和创建委托共识交易时，需要用到的资产 - info","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"info\",\n\"params\":[],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ------------ |\n| chainId | string | 本链的ID |\n| assetId | string | 本链默认主资产的ID |\n| inflationAmount | string | 本链默认主资产的初始数量 |\n| agentChainId | string | 本链共识资产的链ID |\n| agentAssetId | string | 本链共识资产的ID |\n| addressPrefix | string | 本链地址前缀 |\n| symbol | string | 本链主资产符号 |\n"},"response":[]},{"name":"批量创建账户 - createAccount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAccount\",\n\"params\":[chainId, count, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| count | int | 创建数量 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| -------- |\n| 返回值 | list<string> | 返回账户地址集合 |\n"},"response":[]},{"name":"修改账户密码 - updatePassword","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"updatePassword\",\n\"params\":[chainId, address, oldPassword, newPassword],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| oldPassword | string | 原密码 | 是 |\n| newPassword | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否修改成功 |\n"},"response":[]},{"name":"导出账户私钥 - getPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getPriKey\",\n\"params\":[chainId, address, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 私钥 |\n"},"response":[]},{"name":"根据私钥导入账户 - importPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"importPriKey\",\n\"params\":[chainId, priKey, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| priKey | string | 账户明文私钥 | 是 |\n| password | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keystore导入账户 - importKeystore","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"importKeystore\",\n\"params\":[chainId, , password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| keyStoreJson | map | keyStoreJson | 是 |\n| password | string | keystore密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"账户备份，导出账户keystore信息 - exportKeystore","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"exportKeystore\",\n\"params\":[chainId, address, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| -------- |\n| result | string | keystore |\n"},"response":[]},{"name":"查询账户余额 - getAccountBalance","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAccountBalance\",\n\"params\":[chainId, assetChainId, assetId, address],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| assetChainId | int | 资产的链ID | 是 |\n| assetId | int | 资产ID | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ------------------------- |\n| assetChainId | int | 资产链ID |\n| assetId | int | 资产ID |\n| contractAddress | string | 合约地址 |\n| totalBalance | string | 总余额 |\n| balance | string | 可用余额 |\n| timeLock | string | 时间锁定金额 |\n| consensusLock | string | 共识锁定金额 |\n| freeze | string | 总锁定余额 |\n| nonce | string | 账户资产nonce值 |\n| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 |\n"},"response":[]},{"name":"查询账户余额 - getBalanceList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBalanceList\",\n\"params\":[chainId, address, assetIdList],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:------:| ------- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| assetIdList | list | 资产的ID集合 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ------------------------- |\n| assetChainId | int | 资产链ID |\n| assetId | int | 资产ID |\n| contractAddress | string | 合约地址 |\n| totalBalance | string | 总余额 |\n| balance | string | 可用余额 |\n| timeLock | string | 时间锁定金额 |\n| consensusLock | string | 共识锁定金额 |\n| freeze | string | 总锁定余额 |\n| nonce | string | 账户资产nonce值 |\n| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 |\n"},"response":[]},{"name":"设置账户别名 - setAlias","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"setAlias\",\n\"params\":[chainId, address, alias, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| alias | string | 别名 | 是 |\n| password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----------- |\n| value | string | 设置别名交易的hash |\n"},"response":[]},{"name":"验证地址是否正确 - validateAddress","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateAddress\",\n\"params\":[chainId, address],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------- |\n| value | string | boolean |\n"},"response":[]},{"name":"根据账户公钥生成账户地址 - getAddressByPublicKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAddressByPublicKey\",\n\"params\":[chainId, publicKey],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| publicKey | string | 账户公钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:------:| ---- |\n| address | string | 账户地址 |\n"},"response":[]},{"name":"离线 - 批量创建账户 - createAccountOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAccountOffline\",\n\"params\":[chainId, count, prefix, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| count | int | 创建数量 | 是 |\n| prefix | string | 地址前缀 | 否 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------- |:------:| ------ |\n| address | string | 账户地址 |\n| pubKey | string | 公钥 |\n| prikey | string | 明文私钥 |\n| encryptedPrivateKey | string | 加密后的私钥 |\n"},"response":[]},{"name":"离线获取账户明文私钥 - getPriKeyOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getPriKeyOffline\",\n\"params\":[chainId, address, encryptedPrivateKey, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| encryptedPrivateKey | string | 账户密文私钥 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 明文私钥 |\n"},"response":[]},{"name":"离线修改账户密码 - resetPasswordOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"resetPasswordOffline\",\n\"params\":[chainId, address, encryptedPrivateKey, oldPassword, newPassword],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n| encryptedPrivateKey | string | 账户密文私钥 | 是 |\n| oldPassword | string | 原密码 | 是 |\n| newPassword | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---------- |\n| value | string | 重置密码后的加密私钥 |\n"},"response":[]},{"name":"多账户摘要签名 - multiSign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSign\",\n\"params\":[chainId, address, priKey, encryptedPrivateKey, password, txHex],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------- |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| signDtoList | list | 摘要签名表单 | 是 |\n|         address | string | 地址 | 是 |\n|         priKey | string | 明文私钥 | 否 |\n|         encryptedPrivateKey | string | 加密私钥 | 否 |\n|         password | string | 密码 | 否 |\n| txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"明文私钥摘要签名 - priKeySign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"priKeySign\",\n\"params\":[chainId, txHex, address, privateKey],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------- |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| txHex | string | 交易序列化16进制字符串 | 是 |\n| address | string | 账户地址 | 是 |\n| privateKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"密文私钥摘要签名 - encryptedPriKeySign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"encryptedPriKeySign\",\n\"params\":[chainId, txHex, address, encryptedPrivateKey, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------- |:------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| txHex | string | 交易序列化16进制字符串 | 是 |\n| address | string | 账户地址 | 是 |\n| encryptedPrivateKey | string | 账户密文私钥 | 是 |\n| password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"创建多签账户 - createMultiSignAccount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createMultiSignAccount\",\n\"params\":[pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:---------------:| ------ |:----:|\n| pubKeys | list<string> | 账户公钥集合 | 是 |\n| minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 账户的地址 |\n"},"response":[]},{"name":"离线创建设置别名交易 - createAliasTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAliasTx\",\n\"params\":[address, alias, nonce, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:--------:| -------- |:----:|\n| 创建别名交易 | aliasdto | 创建别名交易表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"多签账户离线创建设置别名交易 - createMultiSignAliasTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createMultiSignAliasTx\",\n\"params\":[address, alias, nonce, remark, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------------:| -------- |:----:|\n| 多签账户离线创建设置别名交易 | multisignaliasdto | 创建别名交易表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"根据私钥获取账户地址格式 - getAddressByPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAddressByPriKey\",\n\"params\":[priKey],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------:| ------ |:----:|\n| 原始私钥 | prikeyform | 私钥表单 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"查询钱包内创建的账户列表 - getAddressList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getAddressList\",\n\"params\":[],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n无返回值\n"},"response":[]},{"name":"明文私钥摘要签名消息 - signMessage","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"signMessage\",\n\"params\":[message, privateKey],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------- |:------:| ---- |:----:|\n| message | string | 消息 | 是 |\n| privateKey | string | 私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:----:| ---- |\n| N/A | void | 消息签名 |\n"},"response":[]},{"name":"验证消息签名 - verifySignedMessage","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"verifySignedMessage\",\n\"params\":[message, signature, publicKey],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ---- |:----:|\n| message | string | 消息 | 是 |\n| signature | string | 消息签名 | 是 |\n| publicKey | string | 公钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:-------:| ------ |\n| | boolean | 验证是否成功 |\n"},"response":[]},{"name":"根据私钥获取公钥 - getPubKeyByPriKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getPubKeyByPriKey\",\n\"params\":[priKey],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------:| ------ |:----:|\n| 原始私钥 | prikeyform | 私钥表单 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:----:| ----------- |\n| N/A | void | 公钥的HEX编码字符串 |\n"},"response":[]},{"name":"是否锁定账户 - isBlockAccount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"isBlockAccount\",\n\"params\":[chainId, address],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 是否锁定 |\n"},"response":[]},{"name":"查询锁定账户信息 - getBlockAccountInfo","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockAccountInfo\",\n\"params\":[chainId, address],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| --------- |\n| 返回值 | accountblockdto | 返回一个Map对象 |\n"},"response":[]},{"name":"获取本节点的网络状态信息 - getNetworkInfo","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getNetworkInfo\",\n\"params\":[],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:-----------:| ------ |\n| 返回值 | networkinfo | 返回网络状态 |\n"},"response":[]},{"name":"根据区块高度查询区块头 - getHeaderByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getHeaderByHeight\",\n\"params\":[chainId, height],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| timestamp | long | 区块生成时间戳 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| roundStartTimestamp | long | 当前共识轮开始时间戳 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"根据区块hash查询区块头 - getHeaderByHash","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getHeaderByHash\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| timestamp | long | 区块生成时间戳 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| roundStartTimestamp | long | 当前共识轮开始时间戳 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块头信息 - getBestBlockHeader","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBestBlockHeader\",\n\"params\":[chainId],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| timestamp | long | 区块生成时间戳 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| roundStartTimestamp | long | 当前共识轮开始时间戳 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块 - getBestBlock","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBestBlock\",\n\"params\":[chainId],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         timestamp | long | 区块生成时间戳 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         roundStartTimestamp | long | 当前共识轮开始时间戳 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块 - getBlockByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockByHeight\",\n\"params\":[chainId, height],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         timestamp | long | 区块生成时间戳 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         roundStartTimestamp | long | 当前共识轮开始时间戳 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块hash查询区块 - getBlockByHash","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockByHash\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         timestamp | long | 区块生成时间戳 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         roundStartTimestamp | long | 当前共识轮开始时间戳 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块序列化字符串 - getBlockSerializationByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockSerializationByHeight\",\n\"params\":[chainId, height],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"根据区块hash查询区块序列化字符串 - getBlockSerializationByHash","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getBlockSerializationByHash\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"获取最新主链高度 - getLatestHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getLatestHeight\",\n\"params\":[chainId],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:----:| -------- |\n| 返回值 | long | 获取最新主链高度 |\n"},"response":[]},{"name":"根据hash获取交易 - getTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getTx\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链id | 是 |\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| hash | string | 交易的hash值 |\n| type | int | 交易类型 |\n| time | string | 交易时间 |\n| timestamp | long | 交易时间戳 |\n| blockHeight | long | 区块高度 |\n| blockHash | string | 区块hash |\n| remark | string | 交易备注 |\n| transactionSignature | string | 交易签名 |\n| txDataHex | string | 交易业务数据序列化字符串 |\n| status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n| size | int | 交易大小 |\n| inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n| from | list<object> | 输入 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|         locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n| to | list<object> | 输出 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"验证交易 - validateTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateTx\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| -------- |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"广播交易 - broadcastTx","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"broadcastTx\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证合约) - broadcastTxWithNoContractValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"broadcastTxWithNoContractValidation\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证) - broadcastTxWithoutAnyValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"broadcastTxWithoutAnyValidation\",\n\"params\":[chainId, tx],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| tx | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔转账 - transferOtherChainAsset","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transferOtherChainAsset\",\n\"params\":[chainId, assetChainId, assetId, address, toAddress, password, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| chainId | int | 链id | 是 |\n| assetChainId | int | 资产链id | 是 |\n| assetId | int | 资产id | 是 |\n| address | string | 转出账户地址 | 是 |\n| toAddress | string | 转入账户地址 | 是 |\n| password | string | 转出账户密码 | 是 |\n| amount | string | 转出金额 | 是 |\n| remark | string | 备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------ |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔跨链转账 - crossTransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"crossTransfer\",\n\"params\":[assetChainId, assetId, address, toAddress, password, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| assetChainId | int | 资产链id | 是 |\n| assetId | int | 资产id | 是 |\n| address | string | 转出账户地址 | 是 |\n| toAddress | string | 转入账户地址 | 是 |\n| password | string | 转出账户密码 | 是 |\n| amount | string | 转出金额 | 是 |\n| remark | string | 备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------ |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔链内转账 - transfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transfer\",\n\"params\":[assetChainId, assetId, address, toAddress, password, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| ------ |:----:|\n| assetChainId | int | 资产链id | 是 |\n| assetId | int | 资产id | 是 |\n| address | string | 转出账户地址 | 是 |\n| toAddress | string | 转入账户地址 | 是 |\n| password | string | 转出账户密码 | 是 |\n| amount | string | 转出金额 | 是 |\n| remark | string | 备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------ |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"离线组装转账交易 - createTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createTransferTxOffline\",\n\"params\":[inputs, outputs, time, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"离线组装转账交易 - createCrossTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createCrossTxOffline\",\n\"params\":[inputs, outputs, time, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建转账交易所需手续费 - calcTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"calcTransferTxFee\",\n\"params\":[addressCount, fromLength, toLength, remark, price],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"计算离线创建跨链转账交易所需手续费 - calcCrossTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"calcCrossTxFee\",\n\"params\":[addressCount, fromLength, toLength, remark, price],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"离线组装转账交易 - createMultiSignTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createMultiSignTransferTxOffline\",\n\"params\":[pubKeys, minSigns, inputs, outputs, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| -------- |:----:|\n| transferDto | multisigntransferdto | 转账交易表单 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         remark | string | 交易备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建转账交易所需手续费 - calcMultiSignTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"calcMultiSignTransferTxFee\",\n\"params\":[pubKeyCount, fromLength, toLength, remark, price],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-------------------------:| ---------- |:----:|\n| MultiSignTransferTxFeeDto | multisigntransfertxfeedto | 转账交易手续费 | 是 |\n|         pubKeyCount | int | 多签地址对应公钥数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"发布合约 - contractCreate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCreate\",\n\"params\":[chainId, sender, password, alias, gasLimit, price, contractCode, args, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:--------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| password | string | 账户密码 | 是 |\n| alias | string | 合约别名 | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| args | object[] | 参数列表 | 否 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------- |\n| txHash | string | 发布合约的交易hash |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"调用合约 - contractCall","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCall\",\n\"params\":[chainId, sender, password, value, gasLimit, price, contractAddress, methodName, methodDesc, args, remark, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| password | string | 调用者账户密码 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| remark | string | 交易备注 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 调用合约的交易hash |\n"},"response":[]},{"name":"删除合约 - contractDelete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractDelete\",\n\"params\":[chainId, sender, password, contractAddress, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| password | string | 交易账户密码 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 删除合约的交易hash |\n"},"response":[]},{"name":"合约token转账 - tokentransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"tokentransfer\",\n\"params\":[chainId, fromAddress, password, toAddress, contractAddress, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:----------:| ------------ |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| password | string | 转出者账户密码 | 是 |\n| toAddress | string | 转入者账户地址 | 是 |\n| contractAddress | string | token合约地址 | 是 |\n| amount | biginteger | 转出的token资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"从账户地址向合约地址转账(主链资产)的合约交易 - transfer2contract","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transfer2contract\",\n\"params\":[chainId, fromAddress, password, toAddress, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:----------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| password | string | 转出者账户密码 | 是 |\n| toAddress | string | 转入者账户地址 | 是 |\n| amount | biginteger | 转出的主链资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"获取账户地址的指定合约的token余额 - getTokenBalance","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getTokenBalance\",\n\"params\":[chainId, contractAddress, address],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链id | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------------------- |\n| contractAddress | string | 合约地址 |\n| name | string | token名称 |\n| symbol | string | token符号 |\n| amount | string | token可用数量 |\n| lockAmount | string | token锁定数量 |\n| decimals | long | token支持的小数位数 |\n| blockHeight | long | 合约创建时的区块高度 |\n| status | int | 合约状态(0-不存在, 1-正常, 2-终止) |\n"},"response":[]},{"name":"获取智能合约详细信息 - getContract","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContract\",\n\"params\":[chainId, contractAddress],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| contractAddress | string | 合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------------------------------ |\n| createTxHash | string | 发布合约的交易hash |\n| address | string | 合约地址 |\n| creater | string | 合约创建者地址 |\n| alias | string | 合约别名 |\n| createTime | long | 合约创建时间（单位：秒） |\n| blockHeight | long | 合约创建时的区块高度 |\n| isDirectPayable | boolean | 是否接受直接转账 |\n| directPayableByOtherAsset | boolean | 是否接受其他资产直接转账 |\n| tokenType | int | token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n| nrc20TokenName | string | NRC20-token名称 |\n| nrc20TokenSymbol | string | NRC20-token符号 |\n| decimals | long | NRC20-token支持的小数位数 |\n| totalSupply | string | NRC20-token发行总量 |\n| status | string | 合约状态（not_found, normal, stop） |\n| method | list<object> | 合约方法列表 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取智能合约执行结果 - getContractTxResult","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractTxResult\",\n\"params\":[chainId, hash],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| success | boolean | 合约执行是否成功 |\n| errorMessage | string | 执行失败信息 |\n| contractAddress | string | 合约地址 |\n| result | string | 合约执行结果 |\n| gasLimit | long | GAS限制 |\n| gasUsed | long | 已使用GAS |\n| price | long | GAS单价 |\n| totalFee | string | 交易总手续费 |\n| txSizeFee | string | 交易大小手续费 |\n| actualContractFee | string | 实际执行合约手续费 |\n| refundFee | string | 合约返回的手续费 |\n| value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n| stackTrace | string | 异常堆栈踪迹 |\n| transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         assetChainId | int | 转账金额资产链ID |\n|         assetId | int | 转账金额资产ID |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|                 assetChainId | int | 转入金额资产链ID |\n|                 assetId | int | 转入金额资产ID |\n|                 lockTime | long | 转入金额锁定时间 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| events | list<string> | 合约事件列表 |\n| debugEvents | list<string> | 调式合约事件列表 |\n| tokenTransfers | list<object> | 合约token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         value | string | 转账金额 |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n|         decimals | long | token支持的小数位数 |\n| token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         tokenId | string | tokenId |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n| invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|         cmdName | string | 命令名称 |\n|         args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|         cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|         newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n| contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n| remark | string | 备注 |\n"},"response":[]},{"name":"获取智能合约执行结果列表 - getContractTxResultList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractTxResultList\",\n\"params\":[chainId, hashList],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:---------------:| -------- |:----:|\n| chainId | int | 链ID | 是 |\n| hashList | list<string> | 交易hash列表 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| hash1 or hash2 or hash3... | object | 以交易hash列表中的hash值作为key，这里的key name是动态的 |\n|         success | boolean | 合约执行是否成功 |\n|         errorMessage | string | 执行失败信息 |\n|         contractAddress | string | 合约地址 |\n|         result | string | 合约执行结果 |\n|         gasLimit | long | GAS限制 |\n|         gasUsed | long | 已使用GAS |\n|         price | long | GAS单价 |\n|         totalFee | string | 交易总手续费 |\n|         txSizeFee | string | 交易大小手续费 |\n|         actualContractFee | string | 实际执行合约手续费 |\n|         refundFee | string | 合约返回的手续费 |\n|         value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n|         stackTrace | string | 异常堆栈踪迹 |\n|         transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 assetChainId | int | 转账金额资产链ID |\n|                 assetId | int | 转账金额资产ID |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                         assetChainId | int | 转入金额资产链ID |\n|                         assetId | int | 转入金额资产ID |\n|                         lockTime | long | 转入金额锁定时间 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         events | list<string> | 合约事件列表 |\n|         debugEvents | list<string> | 调式合约事件列表 |\n|         tokenTransfers | list<object> | 合约token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 value | string | 转账金额 |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|                 decimals | long | token支持的小数位数 |\n|         token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 tokenId | string | tokenId |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|         invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|                 cmdName | string | 命令名称 |\n|                 args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|                 cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|                 newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n|         contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n|         remark | string | 备注 |\n"},"response":[]},{"name":"获取合约代码构造函数 - getContractConstructor","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractConstructor\",\n\"params\":[chainId, contractCode],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:------:| -------------------- |:----:|\n| chainId | int | 链ID | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------ |\n| constructor | object | 合约构造函数详情 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n"},"response":[]},{"name":"获取合约方法信息 - getContractMethod","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractMethod\",\n\"params\":[chainId, contractAddress, methodName, methodDesc],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 方法名称 | 是 |\n| methodDesc | string | 方法描述 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------- |:---------------:| ------------------ |\n| name | string | 方法名称 |\n| desc | string | 方法描述 |\n| args | list<object> | 方法参数列表 |\n|         type | string | 参数类型 |\n|         name | string | 参数名称 |\n|         required | boolean | 是否必填 |\n| returnArg | string | 返回值类型 |\n| view | boolean | 是否视图方法（调用此方法数据不上链） |\n| event | boolean | 是否是事件 |\n| payable | boolean | 是否是可接受主链资产转账的方法 |\n| payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 |\n| jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取合约方法参数类型 - getContractMethodArgsTypes","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getContractMethodArgsTypes\",\n\"params\":[chainId, contractAddress, methodName, methodDesc],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 方法名称 | 是 |\n| methodDesc | string | 方法描述 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| ---- |\n| 返回值 | list<string> | |\n"},"response":[]},{"name":"验证发布合约 - validateContractCreate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateContractCreate\",\n\"params\":[chainId, sender, gasLimit, price, contractCode, args],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:--------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证调用合约 - validateContractCall","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateContractCall\",\n\"params\":[chainId, sender, value, gasLimit, price, contractAddress, methodName, methodDesc, args, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| gasLimit | long | GAS限制 | 是 |\n| price | long | GAS单价 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证删除合约 - validateContractDelete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"validateContractDelete\",\n\"params\":[chainId, sender, contractAddress],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"估算发布合约交易的GAS - imputedContractCreateGas","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"imputedContractCreateGas\",\n\"params\":[chainId, sender, contractCode, args],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------ |:--------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"估算调用合约交易的GAS - imputedContractCallGas","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"imputedContractCallGas\",\n\"params\":[chainId, sender, value, contractAddress, methodName, methodDesc, args, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"调用合约不上链方法 - invokeView","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"invokeView\",\n\"params\":[chainId, contractAddress, methodName, methodDesc, args],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:--------:| -------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| --------- |\n| result | string | 视图方法的调用结果 |\n"},"response":[]},{"name":"离线 - 发布合约交易 - contractCreateOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCreateOffline\",\n\"params\":[chainId, sender, senderBalance, nonce, alias, contractCode, gasLimit, args, argsType, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------- |:----------:| -------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| senderBalance | biginteger | 账户余额 | 是 |\n| nonce | string | 账户nonce值 | 是 |\n| alias | string | 合约别名 | 是 |\n| contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| args | object[] | 参数列表 | 否 |\n| argsType | string[] | 参数类型列表 | 否 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"离线 - 调用合约 - contractCallOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractCallOffline\",\n\"params\":[chainId, sender, senderBalance, nonce, value, contractAddress, gasLimit, methodName, methodDesc, args, argsType, remark, multyAssetValues],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------- |:----------:| ----------------------------------------------------------------------------------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| senderBalance | biginteger | 账户余额 | 是 |\n| nonce | string | 账户nonce值 | 是 |\n| value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填BigInteger.ZERO | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| methodName | string | 合约方法 | 是 |\n| methodDesc | string | 合约方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n| args | object[] | 参数列表 | 否 |\n| argsType | string[] | 参数类型列表 | 否 |\n| remark | string | 交易备注 | 否 |\n| multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\,\\]] | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线 - 删除合约 - contractDeleteOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"contractDeleteOffline\",\n\"params\":[chainId, sender, senderBalance, nonce, contractAddress, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:----------:| --------- |:----:|\n| chainId | int | 链id | 是 |\n| sender | string | 交易创建者账户地址 | 是 |\n| senderBalance | biginteger | 账户余额 | 是 |\n| nonce | string | 账户nonce值 | 是 |\n| contractAddress | string | 合约地址 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线 - 合约token转账 - tokentransferOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"tokentransferOffline\",\n\"params\":[chainId, fromAddress, senderBalance, nonce, toAddress, contractAddress, gasLimit, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:----------:| -------------- |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| senderBalance | biginteger | 转出者账户余额 | 是 |\n| nonce | string | 转出者账户nonce值 | 是 |\n| toAddress | string | 转入者账户地址 | 是 |\n| contractAddress | string | token合约地址 | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| amount | biginteger | 转出的token资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线 - 从账户地址向合约地址转账(主链资产)的合约交易 - transfer2contractOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"transfer2contractOffline\",\n\"params\":[chainId, fromAddress, senderBalance, nonce, toAddress, gasLimit, amount, remark],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------- |:----------:| -------------- |:----:|\n| chainId | int | 链id | 是 |\n| fromAddress | string | 转出者账户地址 | 是 |\n| senderBalance | biginteger | 转出者账户余额 | 是 |\n| nonce | string | 转出者账户nonce值 | 是 |\n| toAddress | string | 转入的合约地址 | 是 |\n| gasLimit | long | 设置合约执行消耗的gas上限 | 是 |\n| amount | biginteger | 转出的主链资产金额 | 是 |\n| remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"创建共识节点 - createAgent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAgent\",\n\"params\":[chainId, agentAddress, packingAddress, rewardAddress, commissionRate, deposit, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------------- |:---------------:| ----------- |:----:|\n| chainId | int | 链ID | 是 |\n| CreateAgentForm | createagentform | 创建共识节点表单 | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 奖励地址，默认节点地址 | 否 |\n|         commissionRate | int | 佣金比例 | 是 |\n|         deposit | string | 抵押金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"注销共识节点 - stopAgent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"stopAgent\",\n\"params\":[chainId, address, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------:| -------- |:----:|\n| chainId | int | 链ID | 是 |\n| StopAgentForm | stopagentform | 注销共识节点表单 | 是 |\n|         address | string | 共识节点地址 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"委托参与共识 - depositToAgent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"depositToAgent\",\n\"params\":[chainId, address, agentHash, deposit, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-----------:| -------- |:----:|\n| chainId | int | 链ID | 是 |\n| DepositForm | depositform | 委托参与共识表单 | 是 |\n|         address | string | 参与共识账户地址 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         deposit | string | 参与共识的金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"退出共识 - withdraw","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"withdraw\",\n\"params\":[chainId, address, txHash, password],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:------------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| WithdrawForm | withdrawform | 退出共识表单 | 是 |\n|         address | string | 节点地址 | 是 |\n|         txHash | string | 加入共识时的交易hash | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"查询节点的委托共识列表 - getDepositList","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getDepositList\",\n\"params\":[chainId, agentHash],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ------------- |:----:|\n| chainId | int | 链ID | 是 |\n| agentHash | string | 创建共识节点的交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----------- |:------:| --------- |\n| deposit | string | 委托金额 |\n| agentHash | string | 节点hash |\n| address | string | 账户地址 |\n| time | long | 委托时间 |\n| txHash | string | 委托交易hash |\n| blockHeight | long | 委托时的区块高度 |\n| delHeight | long | 退出委托的区块高度 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数生成一个随机种子并返回 - getRandomSeedByCount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomSeedByCount\",\n\"params\":[chainId, height, count, algorithm],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ------------------------- |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 最大高度 | 是 |\n| count | int | 原始种子个数 | 是 |\n| algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据高度区间生成一个随机种子并返回 - getRandomSeedByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomSeedByHeight\",\n\"params\":[chainId, startHeight, endHeight, algorithm],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:------:| ------------------------- |:----:|\n| chainId | int | 链ID | 是 |\n| startHeight | long | 起始高度 | 是 |\n| endHeight | long | 截止高度 | 是 |\n| algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数查找原始种子列表并返回 - getRandomRawSeedsByCount","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomRawSeedsByCount\",\n\"params\":[chainId, height, count],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ------ |:----:|\n| chainId | int | 链ID | 是 |\n| height | long | 最大高度 | 是 |\n| count | int | 原始种子个数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"根据高度区间查找原始种子列表并返回 - getRandomRawSeedsByHeight","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getRandomRawSeedsByHeight\",\n\"params\":[chainId, startHeight, endHeight],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------- |:----:| ---- |:----:|\n| chainId | int | 链ID | 是 |\n| startHeight | long | 起始高度 | 是 |\n| endHeight | long | 截止高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"离线组装 - 创建共识节点 - createAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"createAgentOffline\",\n\"params\":[chainId, agentAddress, packingAddress, rewardAddress, commissionRate, deposit, input],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:------------:| ---------- |:----:|\n| chainId | int | 链ID | 是 |\n| ConsensusDto | consensusdto | 离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 注销共识节点 - stopAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"stopAgentOffline\",\n\"params\":[chainId, agentHash, agentAddress, deposit, price, depositList],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:----------------:| ----------- |:----:|\n| chainId | int | 链ID | 是 |\n| StopConsensusDto | stopconsensusdto | 离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 委托参与共识 - depositToAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"depositToAgentOffline\",\n\"params\":[chainId, address, deposit, agentHash, input],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:----------:| ---------- |:----:|\n| chainId | int | 链ID | 是 |\n| DepositDto | depositdto | 离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 退出共识 - withdrawOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"withdrawOffline\",\n\"params\":[chainId, address, depositHash, price, input],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-----------:| ----------- |:----:|\n| chainId | int | 链ID | 是 |\n| WithDrawDto | withdrawdto | 离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户创建共识节点 - multiSignCreateAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignCreateAgentOffline\",\n\"params\":[chainId, agentAddress, packingAddress, rewardAddress, commissionRate, deposit, input, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------------:| -------------- |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignConsensusDto | multisignconsensusdto | 多签账户离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户注销共识节点 - multiSignStopAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignStopAgentOffline\",\n\"params\":[chainId, agentHash, agentAddress, deposit, price, depositList, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:-------------------------:| -------------- |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignStopConsensusDto | multisignstopconsensusdto | 多签账户离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户委托参与共识 - multiSignDepositToAgentOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignDepositToAgentOffline\",\n\"params\":[chainId, address, deposit, agentHash, input, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-------------------:| -------------- |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignDepositDto | multisigndepositdto | 多签账户离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户退出共识 - multiSignWithdrawOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"multiSignWithdrawOffline\",\n\"params\":[chainId, address, depositHash, price, input, pubKeys, minSigns],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| ------------ |:----:|\n| chainId | int | 链ID | 是 |\n| MultiSignWithDrawDto | multisignwithdrawdto | 多签账户离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"获取平行链资产信息 - getCrossAssetInfo","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n\"jsonrpc\":\"2.0\",\n\"method\":\"getCrossAssetInfo\",\n\"params\":[chainId, assetId],\n\"id\":1234\n}\n"},"url":{"raw":"https://api.nuls.io/jsonrpc","protocol":"https","host":["api.nuls.io"],"port":null,"path":["jsonrpc"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:----:| ----- |:----:|\n| chainId | int | 资产链ID | 是 |\n| assetId | int | 资产ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:----------------------:| ---- |\n| 返回值 | crossassetregisterinfo | |\n"},"response":[]}]} \ No newline at end of file diff --git a/module/nuls-api/documents/nuls-api_Postman_RESTFUL.json b/module/nuls-api/documents/nuls-api_Postman_RESTFUL.json index 05b64e85ec..dc140c7444 100644 --- a/module/nuls-api/documents/nuls-api_Postman_RESTFUL.json +++ b/module/nuls-api/documents/nuls-api_Postman_RESTFUL.json @@ -1 +1 @@ -{"info":{"_postman_id":"283152a3-df99-4770-b17b-c416dcbf4e38","name":"nuls-api-RESTFUL","schema":"https://schema.getpostman.com/json/collection/v2.1.0/collection.json"},"item":[{"name":"获取本链相关信息 - /api/info","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/info","protocol":"http","host":["localhost"],"port":"18004","path":["api/info"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ------------ |\n| chainId | string | 本链的ID |\n| assetId | string | 本链默认主资产的ID |\n| inflationAmount | string | 本链默认主资产的初始数量 |\n| agentChainId | string | 本链共识资产的链ID |\n| agentAssetId | string | 本链共识资产的ID |\n| addressPrefix | string | 本链地址前缀 |\n| symbol | string | 本链主资产符号 |\n"},"response":[]},{"name":"批量创建账户 - /api/account","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/account","protocol":"http","host":["localhost"],"port":"18004","path":["api/account"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ------------------ |:----:|\n| count | string | 新建账户数量,取值[1-10000] | 是 |\n| password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:---------------:| ---- |\n| list | list<string> | 账户地址 |\n"},"response":[]},{"name":"修改账户密码 - /api/account/password/{address}","request":{"method":"PUT","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"password\" : null,\n \"newPassword\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/password/{address}","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/password/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-------------------------:| -------- |:----:|\n| address | string | 账户地址 | 是 |\n| form | accountupdatepasswordform | 账户密码信息表单 | 是 |\n|         password | string | 原始密码 | 是 |\n|         newPassword | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否修改成功 |\n"},"response":[]},{"name":"导出账户私钥 - /api/account/prikey/{address}","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/prikey/{address}","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/prikey/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------------:| -------- |:----:|\n| address | string | 账户地址 | 是 |\n| form | accountpasswordform | 账户密码信息表单 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 私钥 |\n"},"response":[]},{"name":"根据私钥导入账户 - /api/account/import/pri","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"priKey\" : null,\n \"password\" : null,\n \"overwrite\" : false\n}"},"url":{"raw":"http://localhost:18004/api/account/import/pri","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/import/pri"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-------------------------:| ------------------------------ |:----:|\n| form | accountprikeypasswordform | 根据私钥导入账户表单 | 是 |\n|         priKey | string | 私钥 | 是 |\n|         password | string | 密码 | 是 |\n|         overwrite | boolean | 是否覆盖账户: false:不覆盖导入, true:覆盖导入 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keyStore导入账户 - /api/account/import/keystore","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/account/import/keystore","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/import/keystore"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------:| ---------- |:----:|\n| 根据私钥导入账户 | inputstream | 根据私钥导入账户表单 | 是 |\n|         根据私钥导入账户 | inputstream | 根据私钥导入账户表单 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keystore文件路径导入账户 - /api/account/import/keystore/path","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"path\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/import/keystore/path","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/import/keystore/path"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------------------:| -------------------- |:----:|\n| form | accountkeystoreimportform | 根据keystore文件路径导入账户表单 | 是 |\n|         path | string | 本地keystore文件路径 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keystore字符串导入账户 - /api/account/import/keystore/json","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"keystore\" : {\n \"address\" : null,\n \"encryptedPrivateKey\" : null,\n \"pubKey\" : null,\n \"prikey\" : null\n },\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/import/keystore/json","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/import/keystore/json"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------- |:-----------------------------:| ------------------- |:----:|\n| form | accountkeystorejsonimportform | 根据keystore字符串导入账户表单 | 是 |\n|         keystore | object | keystore字符串 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 encryptedPrivateKey | string | 加密后的私钥 | 是 |\n|                 pubKey | string | 公钥 | 是 |\n|                 prikey | string | 私钥 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"账户备份，导出AccountKeyStore文件到指定目录 - /api/account/export/{address}","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"password\" : null,\n \"path\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/export/{address}","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/export/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:---------------------:| -------------- |:----:|\n| address | string | 账户地址 | 是 |\n| form | accountkeystorebackup | keystone导出信息表单 | 是 |\n|         password | string | 密码 | 是 |\n|         path | string | 文件路径 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------- |\n| path | string | 导出的文件路径 |\n"},"response":[]},{"name":"账户设置别名 - /api/account/alias","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"alias\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/alias","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/alias"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:------------:| -------- |:----:|\n| form | setaliasform | 账户设置别名表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----------- |\n| value | string | 设置别名交易的hash |\n"},"response":[]},{"name":"查询账户余额 - /api/accountledger/balance/{address}","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"assetChainId\" : 0,\n \"assetId\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/balance/{address}","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/balance/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:-----------:| ------ |:----:|\n| balanceDto | balanceform | 账户余额表单 | 是 |\n|         assetChainId | int | 资产的链ID | 是 |\n|         assetId | int | 资产ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------- |:------:| ------------------------- |\n| total | string | 总余额 |\n| freeze | string | 锁定金额 |\n| available | string | 可用余额 |\n| timeLock | string | 时间锁定金额 |\n| consensusLock | string | 共识锁定金额 |\n| nonce | string | 账户资产nonce值 |\n| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 |\n"},"response":[]},{"name":"验证地址格式是否正确 - /api/account/address/validate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"chainId\" : 0,\n \"address\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/address/validate","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/address/validate"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:-------------------:| -------- |:----:|\n| form | validateaddressform | 账户设置别名表单 | 是 |\n|         chainId | int | 链ID | 是 |\n|         address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | true |\n"},"response":[]},{"name":"根据账户公钥生成账户地址 - /api/account/address/publickey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"chainId\" : 0,\n \"publicKey\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/address/publickey","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/address/publickey"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:--------------------:| ------------ |:----:|\n| form | accountpublickeyform | 根据账户公钥生成账户地址 | 是 |\n|         chainId | int | 链ID | 是 |\n|         publicKey | string | 账户公钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:------:| ---- |\n| address | string | 账户地址 |\n"},"response":[]},{"name":"离线 - 批量创建账户 - /api/account/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"chainId\" : 0,\n \"count\" : 0,\n \"prefix\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------------:| ---------- |:----:|\n| form | accountcreateform | 离线批量创建账户表单 | 是 |\n|         count | int | 新建账户数量 | 是 |\n|         prefix | string | 地址前缀 | 否 |\n|         password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------- |:---------------:| ------------ |\n| list | list<object> | 账户keystore列表 |\n|         address | string | 账户地址 |\n|         pubKey | string | 公钥 |\n|         prikey | string | 明文私钥 |\n|         encryptedPrivateKey | string | 加密后的私钥 |\n"},"response":[]},{"name":"离线获取账户明文私钥 - /api/account/priKey/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/priKey/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/priKey/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-------------:| ------------ |:----:|\n| form | getprikeyform | 离线获取账户明文私钥表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 明文私钥 |\n"},"response":[]},{"name":"离线修改账户密码 - /api/account/password/offline/","request":{"method":"PUT","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"oldPassword\" : null,\n \"newPassword\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/password/offline/","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/password/offline/"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-----------------:| ---------- |:----:|\n| form | resetpasswordform | 离线修改账户密码表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         oldPassword | string | 账户原密码 | 是 |\n|         newPassword | string | 账户新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---------- |\n| value | string | 重置密码后的加密私钥 |\n"},"response":[]},{"name":"多账户摘要签名 - /api/account/multi/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"dtoList\" : [ {\n \"address\" : null,\n \"priKey\" : null,\n \"encryptedPrivateKey\" : null,\n \"password\" : null\n } ],\n \"txHex\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/multi/sign","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/multi/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------- |:---------------:| ----------- |:----:|\n| form | multisignform | 多账户摘要签名表单 | 是 |\n|         dtoList | list<object> | keystore集合 | 是 |\n|                 address | string | 地址 | 是 |\n|                 priKey | string | 明文私钥 | 否 |\n|                 encryptedPrivateKey | string | 加密私钥 | 否 |\n|                 password | string | 密码 | 否 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"明文私钥摘要签名 - /api/account/priKey/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null,\n \"address\" : null,\n \"priKey\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/priKey/sign","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/priKey/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:--------------:| ----------- |:----:|\n| form | prikeysignform | 明文私钥摘要签名表单 | 是 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n|         address | string | 账户地址 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"密文私钥摘要签名 - /api/account/encryptedPriKey/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null,\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"password\" : null,\n \"chainId\" : 0,\n \"prefix\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/encryptedPriKey/sign","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/encryptedPriKey/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-----------------------:| ----------- |:----:|\n| form | encryptedprikeysignform | 密文私钥摘要签名表单 | 是 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         password | string | 账户密码 | 是 |\n|         chainId | int | 地址链ID | 是 |\n|         prefix | string | 地址前缀 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"多账号密文私钥摘要签名 - /api/account/encryptedPriKeys/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null,\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"password\" : null,\n \"chainId\" : 0,\n \"prefix\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/encryptedPriKeys/sign","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/encryptedPriKeys/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-----------------------:| ----------- |:----:|\n| form | encryptedprikeysignform | 密文私钥摘要签名表单 | 是 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         password | string | 账户密码 | 是 |\n|         chainId | int | 地址链ID | 是 |\n|         prefix | string | 地址前缀 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"创建多签账户 - /api/account/multiSign/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/account/multiSign/create","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/multiSign/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:--------------------------:| -------- |:----:|\n| form | multisignaccountcreateform | 创建多签账户表单 | 是 |\n|         pubKeys | list<string> | 账户公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 账户的地址 |\n"},"response":[]},{"name":"离线创建设置别名交易 - /api/account/aliasTx/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"alias\" : null,\n \"nonce\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/aliasTx/create","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/aliasTx/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:--------:| -------- |:----:|\n| dto | aliasdto | 创建多签账户表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"多签账户离线创建设置别名交易 - /api/account/multiSign/aliasTx/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"alias\" : null,\n \"nonce\" : null,\n \"remark\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/account/multiSign/aliasTx/create","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/multiSign/aliasTx/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------------:| -------- |:----:|\n| dto | multisignaliasdto | 创建别名交易表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"根据私钥获取账户地址格式 - /api/account/address/priKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"priKey\" : null\n}"},"url":{"raw":"http://localhost:18004/api/account/address/priKey","protocol":"http","host":["localhost"],"port":"18004","path":["api/account/address/priKey"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------:| ------ |:----:|\n| form | prikeyform | 私钥表单 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据区块高度查询区块头 - /api/block/header/height/{height}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/header/height/{height}","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/header/height/{height}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------ |:----:| ---- |:----:|\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"根据区块hash查询区块头 - /api/block/header/hash/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/header/hash/{hash}","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/header/hash/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块头信息 - /api/block/header/newest","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/header/newest","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/header/newest"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块 - /api/block/newest","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/newest","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/newest"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块 - /api/block/height/{height}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/height/{height}","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/height/{height}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------ |:----:| ---- |:----:|\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块hash查询区块 - /api/block/hash/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/hash/{hash}","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/hash/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块序列化字符串 - /api/block/serialization/height/{height}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/serialization/height/{height}","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/serialization/height/{height}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------ |:----:| ---- |:----:|\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"根据区块hash查询区块序列化字符串 - /api/block/serialization/hash/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/block/serialization/hash/{hash}","protocol":"http","host":["localhost"],"port":"18004","path":["api/block/serialization/hash/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"根据hash获取交易 - /api/tx/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/tx/{hash}","protocol":"http","host":["localhost"],"port":"18004","path":["api/tx/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| hash | string | 交易的hash值 |\n| type | int | 交易类型 |\n| time | string | 交易时间 |\n| timestamp | long | 交易时间戳 |\n| blockHeight | long | 区块高度 |\n| blockHash | string | 区块hash |\n| remark | string | 交易备注 |\n| transactionSignature | string | 交易签名 |\n| txDataHex | string | 交易业务数据序列化字符串 |\n| status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n| size | int | 交易大小 |\n| inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n| from | list<object> | 输入 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|         locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n| to | list<object> | 输出 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"验证交易 - /api/accountledger/transaction/validate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/transaction/validate","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/transaction/validate"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------ |:----:|\n| 验证交易是否正确 | txform | 验证交易是否正确表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"广播交易 - /api/accountledger/transaction/broadcast","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/transaction/broadcast","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/transaction/broadcast"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------ |:----:|\n| 广播交易 | txform | 广播交易表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证合约) - /api/accountledger/transaction/broadcastWithNoContractValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/transaction/broadcastWithNoContractValidation","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/transaction/broadcastWithNoContractValidation"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------- |:----:|\n| 广播交易(不验证合约) | txform | 广播交易(不验证合约)表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证) - /api/accountledger/transaction/broadcastTxWithoutAnyValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/transaction/broadcastTxWithoutAnyValidation","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/transaction/broadcastTxWithoutAnyValidation"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------ |:----:|\n| 广播交易(不验证) | txform | 广播交易(不验证)表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"单笔转账 - /api/accountledger/transfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"toAddress\" : null,\n \"password\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/transfer","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/transfer"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:------------:| ------ |:----:|\n| 单笔转账 | transferform | 单笔转账表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         toAddress | string | 账户地址 | 是 |\n|         password | string | 账户密码 | 是 |\n|         assetChainId | int | 资产链ID | 否 |\n|         assetId | int | 资产ID | 否 |\n|         amount | biginteger | 金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"跨链转账 - /api/accountledger/crossTransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"toAddress\" : null,\n \"password\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/crossTransfer","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/crossTransfer"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:-----------------:| --------- |:----:|\n| 跨链转账 | crosstransferform | 跨链转账表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         toAddress | string | 账户地址 | 是 |\n|         password | string | 账户密码 | 是 |\n|         assetChainId | int | 资产chainId | 是 |\n|         assetId | int | 资产Id | 是 |\n|         amount | biginteger | 金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"离线组装转账交易 - /api/accountledger/createTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"inputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n } ],\n \"outputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"lockTime\" : 0\n } ],\n \"time\" : 0,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/createTransferTxOffline","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/createTransferTxOffline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"离线组装跨链转账交易 - /api/accountledger/createCrossTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"inputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n } ],\n \"outputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"lockTime\" : 0\n } ],\n \"time\" : 0,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/createCrossTxOffline","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/createCrossTxOffline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 跨链转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建转账交易所需手续费 - /api/accountledger/calcTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"addressCount\" : 0,\n \"fromLength\" : 0,\n \"toLength\" : 0,\n \"remark\" : null,\n \"price\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/calcTransferTxFee","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/calcTransferTxFee"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"计算离线创建跨链转账交易所需手续费 - /api/accountledger/calcCrossTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"addressCount\" : 0,\n \"fromLength\" : 0,\n \"toLength\" : 0,\n \"remark\" : null,\n \"price\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/calcCrossTxFee","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/calcCrossTxFee"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"多签账户离线组装转账交易 - /api/accountledger/createMultiSignTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"pubKeys\" : [ ],\n \"minSigns\" : 0,\n \"inputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n } ],\n \"outputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"lockTime\" : 0\n } ],\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/createMultiSignTransferTxOffline","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/createMultiSignTransferTxOffline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| ---------- |:----:|\n| transferDto | multisigntransferdto | 多签账户转账交易表单 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         remark | string | 交易备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建多签账户转账交易所需手续费 - /api/accountledger/calcMultiSignTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"pubKeyCount\" : 0,\n \"fromLength\" : 0,\n \"toLength\" : 0,\n \"remark\" : null,\n \"price\" : null\n}"},"url":{"raw":"http://localhost:18004/api/accountledger/calcMultiSignTransferTxFee","protocol":"http","host":["localhost"],"port":"18004","path":["api/accountledger/calcMultiSignTransferTxFee"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-------------------------:| ------------- |:----:|\n| MultiSignTransferTxFeeDto | multisigntransfertxfeedto | 多签账户转账交易手续费表单 | 是 |\n|         pubKeyCount | int | 多签地址对应公钥数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"发布合约 - /api/contract/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"password\" : null,\n \"remark\" : null,\n \"contractCode\" : null,\n \"alias\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/create","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:--------------:| -------------------- |:----:|\n| 发布合约 | contractcreate | 发布合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         password | string | 交易创建者账户密码 | 是 |\n|         remark | string | 备注 | 否 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         alias | string | 合约别名 | 是 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------- |\n| txHash | string | 发布合约的交易hash |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"调用合约 - /api/contract/call","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"password\" : null,\n \"remark\" : null,\n \"contractAddress\" : null,\n \"value\" : null,\n \"multyAssetValues\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/call","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/call"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:------------:| ------------------------------------------------------------------------- |:----:|\n| 调用合约 | contractcall | 调用合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         password | string | 交易创建者账户密码 | 是 |\n|         remark | string | 备注 | 否 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 是 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 调用合约的交易hash |\n"},"response":[]},{"name":"删除合约 - /api/contract/delete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"contractAddress\" : null,\n \"password\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/delete","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/delete"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:--------------:| --------- |:----:|\n| 删除合约 | contractdelete | 删除合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         password | string | 交易创建者账户密码 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 删除合约的交易hash |\n"},"response":[]},{"name":"合约token转账 - /api/contract/tokentransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"password\" : null,\n \"toAddress\" : null,\n \"contractAddress\" : null,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/tokentransfer","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/tokentransfer"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:---------------------:| ------------ |:----:|\n| token转账 | contracttokentransfer | token转账表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         password | string | 转出者账户地址密码 | 是 |\n|         toAddress | string | 转入者账户地址 | 是 |\n|         contractAddress | string | 合约地址 | 是 |\n|         amount | biginteger | 转出的token资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"从账户地址向合约地址转账(主链资产)的合约交易 - /api/contract/transfer2contract","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"password\" : null,\n \"toAddress\" : null,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/transfer2contract","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/transfer2contract"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:----------------:| --------- |:----:|\n| 向合约地址转账 | contracttransfer | 向合约地址转账表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         password | string | 转出者账户地址密码 | 是 |\n|         toAddress | string | 转入的合约地址 | 是 |\n|         amount | biginteger | 转出的主链资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"获取账户地址的指定合约的token余额 - /api/contract/balance/token/{contractAddress}/{address}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/contract/balance/token/{contractAddress}/{address}","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/balance/token/{contractAddress}/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| contractAddress | string | 合约地址 | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------------------- |\n| contractAddress | string | 合约地址 |\n| name | string | token名称 |\n| symbol | string | token符号 |\n| amount | string | token数量 |\n| decimals | long | token支持的小数位数 |\n| blockHeight | long | 合约创建时的区块高度 |\n| status | int | 合约状态(0-不存在, 1-正常, 2-终止) |\n"},"response":[]},{"name":"获取智能合约详细信息 - /api/contract/info/{address}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/contract/info/{address}","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/info/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ---- |:----:|\n| address | string | 合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------------------------------ |\n| createTxHash | string | 发布合约的交易hash |\n| address | string | 合约地址 |\n| creater | string | 合约创建者地址 |\n| alias | string | 合约别名 |\n| createTime | long | 合约创建时间（单位：秒） |\n| blockHeight | long | 合约创建时的区块高度 |\n| isDirectPayable | boolean | 是否接受直接转账 |\n| tokenType | int | token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n| nrc20TokenName | string | NRC20-token名称 |\n| nrc20TokenSymbol | string | NRC20-token符号 |\n| decimals | long | NRC20-token支持的小数位数 |\n| totalSupply | string | NRC20-token发行总量 |\n| status | string | 合约状态（not_found, normal, stop） |\n| method | list<object> | 合约方法列表 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取智能合约执行结果 - /api/contract/result/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/contract/result/{hash}","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/result/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| success | boolean | 合约执行是否成功 |\n| errorMessage | string | 执行失败信息 |\n| contractAddress | string | 合约地址 |\n| result | string | 合约执行结果 |\n| gasLimit | long | GAS限制 |\n| gasUsed | long | 已使用GAS |\n| price | long | GAS单价 |\n| totalFee | string | 交易总手续费 |\n| txSizeFee | string | 交易大小手续费 |\n| actualContractFee | string | 实际执行合约手续费 |\n| refundFee | string | 合约返回的手续费 |\n| value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n| stackTrace | string | 异常堆栈踪迹 |\n| transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         assetChainId | int | 转账金额资产链ID |\n|         assetId | int | 转账金额资产ID |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|                 assetChainId | int | 转入金额资产链ID |\n|                 assetId | int | 转入金额资产ID |\n|                 lockTime | long | 转入金额锁定时间 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| events | list<string> | 合约事件列表 |\n| debugEvents | list<string> | 调式合约事件列表 |\n| tokenTransfers | list<object> | 合约token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         value | string | 转账金额 |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n|         decimals | long | token支持的小数位数 |\n| token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         tokenId | string | tokenId |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n| invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|         cmdName | string | 命令名称 |\n|         args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|         cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|         newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n| contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n| remark | string | 备注 |\n"},"response":[]},{"name":"获取智能合约执行结果列表 - /api/contract/result/list","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"hashList\" : [ ]\n}"},"url":{"raw":"http://localhost:18004/api/contract/result/list","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/result/list"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:----------------------:| -------------- |:----:|\n| 获取智能合约执行结果列表 | contractresultlistform | 获取智能合约执行结果列表表单 | 是 |\n|         hashList | list<string> | 交易hash列表 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| hash1 or hash2 or hash3... | object | 以交易hash列表中的hash值作为key，这里的key name是动态的 |\n|         success | boolean | 合约执行是否成功 |\n|         errorMessage | string | 执行失败信息 |\n|         contractAddress | string | 合约地址 |\n|         result | string | 合约执行结果 |\n|         gasLimit | long | GAS限制 |\n|         gasUsed | long | 已使用GAS |\n|         price | long | GAS单价 |\n|         totalFee | string | 交易总手续费 |\n|         txSizeFee | string | 交易大小手续费 |\n|         actualContractFee | string | 实际执行合约手续费 |\n|         refundFee | string | 合约返回的手续费 |\n|         value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n|         stackTrace | string | 异常堆栈踪迹 |\n|         transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 assetChainId | int | 转账金额资产链ID |\n|                 assetId | int | 转账金额资产ID |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                         assetChainId | int | 转入金额资产链ID |\n|                         assetId | int | 转入金额资产ID |\n|                         lockTime | long | 转入金额锁定时间 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         events | list<string> | 合约事件列表 |\n|         debugEvents | list<string> | 调式合约事件列表 |\n|         tokenTransfers | list<object> | 合约token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 value | string | 转账金额 |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|                 decimals | long | token支持的小数位数 |\n|         token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 tokenId | string | tokenId |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|         invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|                 cmdName | string | 命令名称 |\n|                 args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|                 cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|                 newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n|         contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n|         remark | string | 备注 |\n"},"response":[]},{"name":"获取合约代码构造函数 - /api/contract/constructor","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractCode\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/constructor","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/constructor"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:------------:| -------------------- |:----:|\n| 获取合约代码构造函数 | contractcode | 获取合约代码构造函数表单 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------ |\n| constructor | object | 合约构造函数详情 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n"},"response":[]},{"name":"获取已发布合约指定函数的信息 - /api/contract/method","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/method","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/method"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:------------------:| ------------------------ |:----:|\n| 获取已发布合约指定函数的信息 | contractmethodform | 获取已发布合约指定函数的信息表单 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------- |:---------------:| ------------------ |\n| name | string | 方法名称 |\n| desc | string | 方法描述 |\n| args | list<object> | 方法参数列表 |\n|         type | string | 参数类型 |\n|         name | string | 参数名称 |\n|         required | boolean | 是否必填 |\n| returnArg | string | 返回值类型 |\n| view | boolean | 是否视图方法（调用此方法数据不上链） |\n| event | boolean | 是否是事件 |\n| payable | boolean | 是否是可接受主链资产转账的方法 |\n| jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取已发布合约指定函数的参数类型列表 - /api/contract/method/argstypes","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/method/argstypes","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/method/argstypes"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:------------------:| ------------------------ |:----:|\n| 获取已发布合约指定函数的参数类型列表 | contractmethodform | 获取已发布合约指定函数的参数类型表单 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| ---- |\n| 返回值 | list<string> | |\n"},"response":[]},{"name":"验证发布合约 - /api/contract/validate/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"contractCode\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/validate/create","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/validate/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------------:| -------------------- |:----:|\n| 验证发布合约 | contractvalidatecreate | 验证发布合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证调用合约 - /api/contract/validate/call","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"value\" : 0,\n \"multyAssetValues\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/validate/call","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/validate/call"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:--------------------:| ------------------------------------------------------------------------- |:----:|\n| 验证调用合约 | contractvalidatecall | 验证调用合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         value | long | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 否 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名称 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证删除合约 - /api/contract/validate/delete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"contractAddress\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/validate/delete","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/validate/delete"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:----------------------:| -------- |:----:|\n| 验证删除合约 | contractvalidatedelete | 验证删除合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"估算发布合约交易的GAS - /api/contract/imputedgas/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"contractCode\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/imputedgas/create","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/imputedgas/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:------------------------:| -------------------- |:----:|\n| 估算发布合约交易的GAS | imputedgascontractcreate | 估算发布合约交易的GAS表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"估算调用合约交易的GAS - /api/contract/imputedgas/call","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"value\" : null,\n \"multyAssetValues\" : null,\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/imputedgas/call","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/imputedgas/call"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:----------------------:| ------------------------------------------------------------------------- |:----:|\n| 估算调用合约交易的GAS | imputedgascontractcall | 估算调用合约交易的GAS表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 否 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名称 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"调用合约不上链方法 - /api/contract/view","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/view","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/view"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:----------------:| ------------------------ |:----:|\n| 调用合约不上链方法 | contractviewcall | 调用合约不上链方法表单 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名称 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| --------- |\n| result | string | 视图方法的调用结果 |\n"},"response":[]},{"name":"离线组装 - 发布合约的交易 - /api/contract/create/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"alias\" : null,\n \"contractCode\" : null,\n \"gasLimit\" : 0,\n \"args\" : null,\n \"argsType\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/create/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/create/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------- |:---------------------:| -------------------- |:----:|\n| 发布合约离线交易 | contractcreateoffline | 发布合约离线交易表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         senderBalance | biginteger | 账户余额 | 是 |\n|         nonce | string | 账户nonce值 | 是 |\n|         alias | string | 合约别名 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         args | object[] | 参数列表 | 否 |\n|         argsType | string[] | 参数类型列表 | 否 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"离线组装 - 调用合约的交易 - /api/contract/call/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"contractAddress\" : null,\n \"gasLimit\" : 0,\n \"value\" : null,\n \"multyAssetValues\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null,\n \"argsType\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/call/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/call/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:-------------------:| ----------------------------------------------------------------------------------- |:----:|\n| 调用合约离线交易 | contractcalloffline | 调用合约离线交易表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         senderBalance | biginteger | 账户余额 | 是 |\n|         nonce | string | 账户nonce值 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 是 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\,\\]] | 否 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n|         argsType | string[] | 参数类型列表 | 否 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 删除合约交易 - /api/contract/delete/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"contractAddress\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/delete/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/delete/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:---------------------:| ---------- |:----:|\n| 删除合约离线交易 | contractdeleteoffline | 删除合约离线交易表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         senderBalance | biginteger | 账户余额 | 是 |\n|         nonce | string | 账户nonce值 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 合约token转账交易 - /api/contract/tokentransfer/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"toAddress\" : null,\n \"contractAddress\" : null,\n \"gasLimit\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/tokentransfer/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/tokentransfer/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:----------------------------:| ------------- |:----:|\n| token转账离线交易 | contracttokentransferoffline | token转账离线交易表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         senderBalance | biginteger | 转出者账户余额 | 是 |\n|         nonce | string | 转出者账户nonce值 | 是 |\n|         toAddress | string | 转入者账户地址 | 是 |\n|         contractAddress | string | 合约地址 | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         amount | biginteger | 转出的token资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 从账户地址向合约地址转账(主链资产)的合约交易 - /api/contract/transfer2contract/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"toAddress\" : null,\n \"gasLimit\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"http://localhost:18004/api/contract/transfer2contract/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/contract/transfer2contract/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------- |:-----------------------:| ------------- |:----:|\n| 向合约地址转账离线交易 | contracttransferoffline | 向合约地址转账离线交易表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         senderBalance | biginteger | 转出者账户余额 | 是 |\n|         nonce | string | 转出者账户nonce值 | 是 |\n|         toAddress | string | 转入的合约地址 | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         amount | biginteger | 转出的主链资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"创建共识节点 - /api/consensus/agent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentAddress\" : null,\n \"packingAddress\" : null,\n \"rewardAddress\" : null,\n \"commissionRate\" : 0,\n \"deposit\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/consensus/agent","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/agent"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------------- |:---------------:| ----------- |:----:|\n| CreateAgentForm | createagentform | 创建共识节点表单 | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 奖励地址，默认节点地址 | 否 |\n|         commissionRate | int | 佣金比例 | 是 |\n|         deposit | string | 抵押金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"注销共识节点 - /api/consensus/agent/stop","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/consensus/agent/stop","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/agent/stop"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------:| -------- |:----:|\n| StopAgentForm | stopagentform | 注销共识节点表单 | 是 |\n|         address | string | 共识节点地址 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"委托参与共识 - /api/consensus/deposit","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"agentHash\" : null,\n \"deposit\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/consensus/deposit","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/deposit"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-----------:| -------- |:----:|\n| DepositForm | depositform | 委托参与共识表单 | 是 |\n|         address | string | 参与共识账户地址 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         deposit | string | 参与共识的金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"退出共识 - /api/consensus/withdraw","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"txHash\" : null,\n \"password\" : null\n}"},"url":{"raw":"http://localhost:18004/api/consensus/withdraw","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/withdraw"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:------------:| ------------ |:----:|\n| 退出共识 | withdrawform | 退出共识表单 | 是 |\n|         address | string | 节点地址 | 是 |\n|         txHash | string | 加入共识时的交易hash | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"查询节点的委托共识列表 - /api/consensus/list/deposit/{agentHash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"http://localhost:18004/api/consensus/list/deposit/{agentHash}","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/list/deposit/{agentHash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ------------- |:----:|\n| agentHash | string | 创建共识节点的交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----------- |:------:| --------- |\n| deposit | string | 委托金额 |\n| agentHash | string | 节点hash |\n| address | string | 账户地址 |\n| time | long | 委托时间 |\n| txHash | string | 委托交易hash |\n| blockHeight | long | 委托时的区块高度 |\n| delHeight | long | 退出委托的区块高度 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数生成一个随机种子并返回 - /api/consensus/random/seed/count","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"height\" : 0,\n \"count\" : 0,\n \"algorithm\" : null\n}"},"url":{"raw":"http://localhost:18004/api/consensus/random/seed/count","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/random/seed/count"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-------------------:| ------------------------- |:----:|\n| RandomSeedCountForm | randomseedcountform | 随机种子表单 | 是 |\n|         height | long | 最大高度 | 是 |\n|         count | int | 原始种子个数 | 是 |\n|         algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据高度区间生成一个随机种子并返回 - /api/consensus/random/seed/height","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"startHeight\" : 0,\n \"endHeight\" : 0,\n \"algorithm\" : null\n}"},"url":{"raw":"http://localhost:18004/api/consensus/random/seed/height","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/random/seed/height"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:--------------------:| ------------------------- |:----:|\n| RandomSeedHeightForm | randomseedheightform | 随机种子表单 | 是 |\n|         startHeight | long | 起始高度 | 是 |\n|         endHeight | long | 截止高度 | 是 |\n|         algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数查找原始种子列表并返回 - /api/consensus/random/rawseed/count","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"height\" : 0,\n \"count\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/consensus/random/rawseed/count","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/random/rawseed/count"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------------------:| -------- |:----:|\n| RandomRawSeedCountForm | randomrawseedcountform | 原始随机种子表单 | 是 |\n|         height | long | 最大高度 | 是 |\n|         count | int | 原始种子个数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"根据高度区间查找原始种子列表并返回 - /api/consensus/random/rawseed/height","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"startHeight\" : 0,\n \"endHeight\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/consensus/random/rawseed/height","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/random/rawseed/height"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-----------------------:| -------- |:----:|\n| RandomRawSeedHeightForm | randomrawseedheightform | 原始随机种子表单 | 是 |\n|         startHeight | long | 起始高度 | 是 |\n|         endHeight | long | 截止高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"离线组装 - 创建共识节点交易 - /api/consensus/agent/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentAddress\" : null,\n \"packingAddress\" : null,\n \"rewardAddress\" : null,\n \"commissionRate\" : 0,\n \"deposit\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n}"},"url":{"raw":"http://localhost:18004/api/consensus/agent/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/agent/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:------------:| ---------- |:----:|\n| ConsensusDto | consensusdto | 离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 注销共识节点交易 - /api/consensus/agent/stop/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentHash\" : null,\n \"agentAddress\" : null,\n \"deposit\" : null,\n \"price\" : null,\n \"depositList\" : [ {\n \"depositHash\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n } ]\n}"},"url":{"raw":"http://localhost:18004/api/consensus/agent/stop/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/agent/stop/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:----------------:| ----------- |:----:|\n| StopConsensusDto | stopconsensusdto | 离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 委托参与共识交易 - /api/consensus/deposit/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"deposit\" : null,\n \"agentHash\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n}"},"url":{"raw":"http://localhost:18004/api/consensus/deposit/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/deposit/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:----------:| ---------- |:----:|\n| DepositDto | depositdto | 离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 退出共识交易 - /api/consensus/withdraw/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"depositHash\" : null,\n \"price\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n}"},"url":{"raw":"http://localhost:18004/api/consensus/withdraw/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/withdraw/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-----------:| ----------- |:----:|\n| WithDrawDto | withdrawdto | 离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"多签账户离线组装 - 创建共识节点交易 - /api/consensus/multiSign/agent/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentAddress\" : null,\n \"packingAddress\" : null,\n \"rewardAddress\" : null,\n \"commissionRate\" : 0,\n \"deposit\" : null,\n \"input\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/consensus/multiSign/agent/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/multiSign/agent/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------------:| -------------- |:----:|\n| MultiSignConsensusDto | multisignconsensusdto | 多签账户离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户委托参与共识交易 - /api/consensus/multiSign/deposit/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"deposit\" : null,\n \"agentHash\" : null,\n \"input\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/consensus/multiSign/deposit/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/multiSign/deposit/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-------------------:| -------------- |:----:|\n| MultiSignDepositDto | multisigndepositdto | 多签账户离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户退出共识交易 - /api/consensus/multiSign/withdraw/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"depositHash\" : null,\n \"price\" : null,\n \"input\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/consensus/multiSign/withdraw/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/multiSign/withdraw/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| ------------ |:----:|\n| WithDrawDto | multisignwithdrawdto | 多签账户离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户注销共识节点交易 - /api/consensus/multiSign/agent/stop/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentHash\" : null,\n \"agentAddress\" : null,\n \"deposit\" : null,\n \"price\" : null,\n \"depositList\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"http://localhost:18004/api/consensus/multiSign/agent/stop/offline","protocol":"http","host":["localhost"],"port":"18004","path":["api/consensus/multiSign/agent/stop/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:-------------------------:| -------------- |:----:|\n| StopConsensusDto | multisignstopconsensusdto | 多签账户离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]}]} \ No newline at end of file +{"info":{"_postman_id":"6df0086b-d70a-4319-a8e1-d054e0571f20","name":"nuls-api-RESTFUL","schema":"https://schema.getpostman.com/json/collection/v2.1.0/collection.json"},"item":[{"name":"获取本链相关信息 - /api/info","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/info","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/info"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ------------ |\n| chainId | string | 本链的ID |\n| assetId | string | 本链默认主资产的ID |\n| inflationAmount | string | 本链默认主资产的初始数量 |\n| agentChainId | string | 本链共识资产的链ID |\n| agentAssetId | string | 本链共识资产的ID |\n| addressPrefix | string | 本链地址前缀 |\n| symbol | string | 本链主资产符号 |\n"},"response":[]},{"name":"批量创建账户 - /api/account/multiSign/aliasTx/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/account/multiSign/aliasTx/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/multiSign/aliasTx/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------- |:------:| ------------------ |:----:|\n| count | string | 新建账户数量,取值[1-10000] | 是 |\n| password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:---------------:| ---- |\n| list | list<string> | 账户地址 |\n"},"response":[]},{"name":"修改账户密码 - /api/account/password/{address}","request":{"method":"PUT","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"password\" : null,\n \"newPassword\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/password/{address}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/password/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-------------------------:| -------- |:----:|\n| address | string | 账户地址 | 是 |\n| form | accountupdatepasswordform | 账户密码信息表单 | 是 |\n|         password | string | 原始密码 | 是 |\n|         newPassword | string | 新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否修改成功 |\n"},"response":[]},{"name":"导出账户私钥 - /api/account/prikey/{address}","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/prikey/{address}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/prikey/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------------:| -------- |:----:|\n| address | string | 账户地址 | 是 |\n| form | accountpasswordform | 账户密码信息表单 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 私钥 |\n"},"response":[]},{"name":"根据私钥导入账户 - /api/account/import/pri","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"priKey\" : null,\n \"password\" : null,\n \"overwrite\" : false\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/import/pri","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/import/pri"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-------------------------:| ------------------------------ |:----:|\n| form | accountprikeypasswordform | 根据私钥导入账户表单 | 是 |\n|         priKey | string | 私钥 | 是 |\n|         password | string | 密码 | 是 |\n|         overwrite | boolean | 是否覆盖账户: false:不覆盖导入, true:覆盖导入 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keyStore导入账户 - /api/account/import/keystore","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/account/import/keystore","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/import/keystore"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------:| ---------- |:----:|\n| 根据私钥导入账户 | inputstream | 根据私钥导入账户表单 | 是 |\n|         根据私钥导入账户 | inputstream | 根据私钥导入账户表单 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keystore文件路径导入账户 - /api/account/import/keystore/path","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"path\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/import/keystore/path","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/import/keystore/path"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------------------:| -------------------- |:----:|\n| form | accountkeystoreimportform | 根据keystore文件路径导入账户表单 | 是 |\n|         path | string | 本地keystore文件路径 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据keystore字符串导入账户 - /api/account/import/keystore/json","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"keystore\" : {\n \"address\" : null,\n \"encryptedPrivateKey\" : null,\n \"pubKey\" : null,\n \"prikey\" : null\n },\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/import/keystore/json","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/import/keystore/json"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------- |:-----------------------------:| ------------------- |:----:|\n| form | accountkeystorejsonimportform | 根据keystore字符串导入账户表单 | 是 |\n|         keystore | object | keystore字符串 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 encryptedPrivateKey | string | 加密后的私钥 | 是 |\n|                 pubKey | string | 公钥 | 是 |\n|                 prikey | string | 私钥 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"账户备份，导出AccountKeyStore文件到指定目录 - /api/account/export/{address}","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"password\" : null,\n \"path\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/export/{address}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/export/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:---------------------:| -------------- |:----:|\n| address | string | 账户地址 | 是 |\n| form | accountkeystorebackup | keystone导出信息表单 | 是 |\n|         password | string | 密码 | 是 |\n|         path | string | 文件路径 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ---- |:------:| ------- |\n| path | string | 导出的文件路径 |\n"},"response":[]},{"name":"账户设置别名 - /api/account/alias","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"alias\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/alias","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/alias"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:------------:| -------- |:----:|\n| form | setaliasform | 账户设置别名表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----------- |\n| value | string | 设置别名交易的hash |\n"},"response":[]},{"name":"查询账户余额 - /api/accountledger/balance/{address}","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"assetChainId\" : 0,\n \"assetId\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/balance/{address}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/balance/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:-----------:| ------ |:----:|\n| balanceDto | balanceform | 账户余额表单 | 是 |\n|         assetChainId | int | 资产的链ID | 是 |\n|         assetId | int | 资产ID | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------- |:------:| ------------------------- |\n| total | string | 总余额 |\n| freeze | string | 锁定金额 |\n| available | string | 可用余额 |\n| timeLock | string | 时间锁定金额 |\n| consensusLock | string | 共识锁定金额 |\n| nonce | string | 账户资产nonce值 |\n| nonceType | int | 1：已确认的nonce值,0：未确认的nonce值 |\n"},"response":[]},{"name":"验证地址格式是否正确 - /api/account/address/validate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"chainId\" : 0,\n \"address\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/address/validate","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/address/validate"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:-------------------:| -------- |:----:|\n| form | validateaddressform | 账户设置别名表单 | 是 |\n|         chainId | int | 链ID | 是 |\n|         address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | true |\n"},"response":[]},{"name":"根据账户公钥生成账户地址 - /api/account/address/publickey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"chainId\" : 0,\n \"publicKey\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/address/publickey","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/address/publickey"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:--------------------:| ------------ |:----:|\n| form | accountpublickeyform | 根据账户公钥生成账户地址 | 是 |\n|         chainId | int | 链ID | 是 |\n|         publicKey | string | 账户公钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:------:| ---- |\n| address | string | 账户地址 |\n"},"response":[]},{"name":"离线 - 批量创建账户 - /api/account/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"chainId\" : 0,\n \"count\" : 0,\n \"prefix\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------------:| ---------- |:----:|\n| form | accountcreateform | 离线批量创建账户表单 | 是 |\n|         chainId | int | 链ID | 是 |\n|         count | int | 新建账户数量 | 是 |\n|         prefix | string | 地址前缀 | 否 |\n|         password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------- |:---------------:| ------------ |\n| list | list<object> | 账户keystore列表 |\n|         address | string | 账户地址 |\n|         pubKey | string | 公钥 |\n|         prikey | string | 明文私钥 |\n|         encryptedPrivateKey | string | 加密后的私钥 |\n"},"response":[]},{"name":"离线获取账户明文私钥 - /api/account/priKey/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/priKey/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/priKey/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-------------:| ------------ |:----:|\n| form | getprikeyform | 离线获取账户明文私钥表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         password | string | 账户密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 明文私钥 |\n"},"response":[]},{"name":"离线修改账户密码 - /api/account/password/offline/","request":{"method":"PUT","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"oldPassword\" : null,\n \"newPassword\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/password/offline/","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/password/offline/"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-----------------:| ---------- |:----:|\n| form | resetpasswordform | 离线修改账户密码表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         oldPassword | string | 账户原密码 | 是 |\n|         newPassword | string | 账户新密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---------- |\n| value | string | 重置密码后的加密私钥 |\n"},"response":[]},{"name":"多账户摘要签名 - /api/account/multi/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"dtoList\" : [ {\n \"address\" : null,\n \"priKey\" : null,\n \"encryptedPrivateKey\" : null,\n \"password\" : null\n } ],\n \"txHex\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/multi/sign","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/multi/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------- |:---------------:| ----------- |:----:|\n| form | multisignform | 多账户摘要签名表单 | 是 |\n|         dtoList | list<object> | keystore集合 | 是 |\n|                 address | string | 地址 | 是 |\n|                 priKey | string | 明文私钥 | 否 |\n|                 encryptedPrivateKey | string | 加密私钥 | 否 |\n|                 password | string | 密码 | 否 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"明文私钥摘要签名 - /api/account/priKey/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null,\n \"address\" : null,\n \"priKey\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/priKey/sign","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/priKey/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:--------------:| ----------- |:----:|\n| form | prikeysignform | 明文私钥摘要签名表单 | 是 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n|         address | string | 账户地址 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"密文私钥摘要签名 - /api/account/encryptedPriKey/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null,\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"password\" : null,\n \"chainId\" : 0,\n \"prefix\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/encryptedPriKey/sign","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/encryptedPriKey/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-----------------------:| ----------- |:----:|\n| form | encryptedprikeysignform | 密文私钥摘要签名表单 | 是 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         password | string | 账户密码 | 是 |\n|         chainId | int | 地址链ID | 是 |\n|         prefix | string | 地址前缀 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"多账号密文私钥摘要签名 - /api/account/encryptedPriKeys/sign","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null,\n \"address\" : null,\n \"encryptedPriKey\" : null,\n \"password\" : null,\n \"chainId\" : 0,\n \"prefix\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/encryptedPriKeys/sign","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/encryptedPriKeys/sign"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:-----------------------:| ----------- |:----:|\n| form | encryptedprikeysignform | 密文私钥摘要签名表单 | 是 |\n|         txHex | string | 交易序列化Hex字符串 | 是 |\n|         address | string | 账户地址 | 是 |\n|         encryptedPriKey | string | 账户密文私钥 | 是 |\n|         password | string | 账户密码 | 是 |\n|         chainId | int | 地址链ID | 是 |\n|         prefix | string | 地址前缀 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------- |\n| hash | string | 交易hash |\n| txHex | string | 签名后的交易16进制字符串 |\n"},"response":[]},{"name":"创建多签账户 - /api/account/multiSign/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/multiSign/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/multiSign/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:--------------------------:| -------- |:----:|\n| form | multisignaccountcreateform | 创建多签账户表单 | 是 |\n|         pubKeys | list<string> | 账户公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 账户的地址 |\n"},"response":[]},{"name":"离线创建设置别名交易 - /api/account/aliasTx/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"alias\" : null,\n \"nonce\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/aliasTx/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/aliasTx/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------- |:--------:| -------- |:----:|\n| dto | aliasdto | 创建多签账户表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"多签账户离线创建设置别名交易 - /api/account/multiSign/aliasTx/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"alias\" : null,\n \"nonce\" : null,\n \"remark\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/multiSign/aliasTx/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/multiSign/aliasTx/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-----------------:| -------- |:----:|\n| dto | multisignaliasdto | 创建别名交易表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         alias | string | 别名 | 是 |\n|         nonce | string | 资产nonce值 | 是 |\n|         remark | string | 交易备注 | 否 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"根据私钥获取账户地址格式 - /api/account/address/priKey","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"priKey\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/account/address/priKey","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/account/address/priKey"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------:| ------ |:----:|\n| form | prikeyform | 私钥表单 | 是 |\n|         priKey | string | 账户明文私钥 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ---- |\n| value | string | 账户地址 |\n"},"response":[]},{"name":"根据区块高度查询区块头 - /api/block/header/height/{height}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/header/height/{height}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/header/height/{height}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------ |:----:| ---- |:----:|\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| timestamp | long | 区块生成时间戳 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| roundStartTimestamp | long | 当前共识轮开始时间戳 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"根据区块hash查询区块头 - /api/block/header/hash/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/header/hash/{hash}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/header/hash/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| timestamp | long | 区块生成时间戳 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| roundStartTimestamp | long | 当前共识轮开始时间戳 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块头信息 - /api/block/header/newest","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/header/newest","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/header/newest"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------- |:---------------:| -------------------- |\n| hash | string | 区块的hash值 |\n| preHash | string | 上一个区块的hash值 |\n| merkleHash | string | 梅克尔hash |\n| time | string | 区块生成时间 |\n| timestamp | long | 区块生成时间戳 |\n| height | long | 区块高度 |\n| txCount | int | 区块打包交易数量 |\n| blockSignature | string | 签名Hex.encode(byte[]) |\n| size | int | 大小 |\n| packingAddress | string | 打包地址 |\n| roundIndex | long | 共识轮次 |\n| consensusMemberCount | int | 参与共识成员数量 |\n| roundStartTime | string | 当前共识轮开始时间 |\n| roundStartTimestamp | long | 当前共识轮开始时间戳 |\n| packingIndexOfRound | int | 当前轮次打包出块的名次 |\n| mainVersion | short | 主网当前生效的版本 |\n| blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n| stateRoot | string | 智能合约世界状态根 |\n| txHashList | list<string> | 区块打包的交易hash集合 |\n"},"response":[]},{"name":"查询最新区块 - /api/block/newest","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/newest","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/newest"]},"description":"\n\n#### 参数列表\n无参数\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         timestamp | long | 区块生成时间戳 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         roundStartTimestamp | long | 当前共识轮开始时间戳 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块 - /api/block/height/{height}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/height/{height}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/height/{height}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------ |:----:| ---- |:----:|\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         timestamp | long | 区块生成时间戳 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         roundStartTimestamp | long | 当前共识轮开始时间戳 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块hash查询区块 - /api/block/hash/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/hash/{hash}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/hash/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| header | object | 区块头信息, 只返回对应的部分数据 |\n|         hash | string | 区块的hash值 |\n|         preHash | string | 上一个区块的hash值 |\n|         merkleHash | string | 梅克尔hash |\n|         time | string | 区块生成时间 |\n|         timestamp | long | 区块生成时间戳 |\n|         height | long | 区块高度 |\n|         txCount | int | 区块打包交易数量 |\n|         blockSignature | string | 签名Hex.encode(byte[]) |\n|         size | int | 大小 |\n|         packingAddress | string | 打包地址 |\n|         roundIndex | long | 共识轮次 |\n|         consensusMemberCount | int | 参与共识成员数量 |\n|         roundStartTime | string | 当前共识轮开始时间 |\n|         roundStartTimestamp | long | 当前共识轮开始时间戳 |\n|         packingIndexOfRound | int | 当前轮次打包出块的名次 |\n|         mainVersion | short | 主网当前生效的版本 |\n|         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 |\n|         stateRoot | string | 智能合约世界状态根 |\n|         txHashList | list<string> | 区块打包的交易hash集合 |\n| txs | list<object> | 交易列表 |\n|         hash | string | 交易的hash值 |\n|         type | int | 交易类型 |\n|         time | string | 交易时间 |\n|         timestamp | long | 交易时间戳 |\n|         blockHeight | long | 区块高度 |\n|         blockHash | string | 区块hash |\n|         remark | string | 交易备注 |\n|         transactionSignature | string | 交易签名 |\n|         txDataHex | string | 交易业务数据序列化字符串 |\n|         status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n|         size | int | 交易大小 |\n|         inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n|         from | list<object> | 输入 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|                 locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n|         to | list<object> | 输出 |\n|                 address | string | 账户地址 |\n|                 assetsChainId | int | 资产发行链的id |\n|                 assetsId | int | 资产id |\n|                 amount | string | 数量 |\n|                 lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"根据区块高度查询区块序列化字符串 - /api/block/serialization/height/{height}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/serialization/height/{height}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/serialization/height/{height}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------ |:----:| ---- |:----:|\n| height | long | 区块高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"根据区块hash查询区块序列化字符串 - /api/block/serialization/hash/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/block/serialization/hash/{hash}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/block/serialization/hash/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 区块hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:------:| --------------- |\n| 返回值 | string | 返回区块序列化后的HEX字符串 |\n"},"response":[]},{"name":"根据hash获取交易 - /api/tx/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/tx/{hash}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/tx/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------- |:---------------:| ----------------------------------------- |\n| hash | string | 交易的hash值 |\n| type | int | 交易类型 |\n| time | string | 交易时间 |\n| timestamp | long | 交易时间戳 |\n| blockHeight | long | 区块高度 |\n| blockHash | string | 区块hash |\n| remark | string | 交易备注 |\n| transactionSignature | string | 交易签名 |\n| txDataHex | string | 交易业务数据序列化字符串 |\n| status | int | 交易状态 0:unConfirm(待确认), 1:confirm(已确认) |\n| size | int | 交易大小 |\n| inBlockIndex | int | 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 |\n| from | list<object> | 输入 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         nonce | string | 账户nonce值的Hex字符串，防止双花交易，取上一笔交易hash的最后8个字节 |\n|         locked | byte | 0普通交易，-1解锁金额交易（退出共识，退出委托） |\n| to | list<object> | 输出 |\n|         address | string | 账户地址 |\n|         assetsChainId | int | 资产发行链的id |\n|         assetsId | int | 资产id |\n|         amount | string | 数量 |\n|         lockTime | long | 解锁时间，-1为永久锁定 |\n"},"response":[]},{"name":"验证交易 - /api/accountledger/transaction/validate","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/transaction/validate","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/transaction/validate"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------ |:----:|\n| 验证交易是否正确 | txform | 验证交易是否正确表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"广播交易 - /api/accountledger/transaction/broadcast","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/transaction/broadcast","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/transaction/broadcast"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------ |:----:|\n| 广播交易 | txform | 广播交易表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证合约) - /api/accountledger/transaction/broadcastWithNoContractValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/transaction/broadcastWithNoContractValidation","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/transaction/broadcastWithNoContractValidation"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------- |:----:|\n| 广播交易(不验证合约) | txform | 广播交易(不验证合约)表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"广播交易(不验证) - /api/accountledger/transaction/broadcastTxWithoutAnyValidation","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"txHex\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/transaction/broadcastTxWithoutAnyValidation","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/transaction/broadcastTxWithoutAnyValidation"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------- |:------:| ------------ |:----:|\n| 广播交易(不验证) | txform | 广播交易(不验证)表单 | 是 |\n|         txHex | string | 交易序列化16进制字符串 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:-------:| ------ |\n| value | boolean | 是否成功 |\n| hash | string | 交易hash |\n"},"response":[]},{"name":"跨链转账 - /api/accountledger/crossTransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"toAddress\" : null,\n \"password\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/crossTransfer","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/crossTransfer"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:-----------------:| --------- |:----:|\n| 跨链转账 | crosstransferform | 跨链转账表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         toAddress | string | 账户地址 | 是 |\n|         password | string | 账户密码 | 是 |\n|         assetChainId | int | 资产chainId | 是 |\n|         assetId | int | 资产Id | 是 |\n|         amount | biginteger | 金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"单笔转账 - /api/accountledger/transfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"toAddress\" : null,\n \"password\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/transfer","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/transfer"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:------------:| ------ |:----:|\n| 单笔转账 | transferform | 单笔转账表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         toAddress | string | 账户地址 | 是 |\n|         password | string | 账户密码 | 是 |\n|         assetChainId | int | 资产链ID | 否 |\n|         assetId | int | 资产ID | 否 |\n|         amount | biginteger | 金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"离线组装转账交易 - /api/accountledger/createTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"inputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n } ],\n \"outputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"lockTime\" : 0\n } ],\n \"time\" : 0,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/createTransferTxOffline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/createTransferTxOffline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"离线组装跨链转账交易 - /api/accountledger/createCrossTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"inputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n } ],\n \"outputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"lockTime\" : 0\n } ],\n \"time\" : 0,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/createCrossTxOffline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/createCrossTxOffline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| -------- |:----:|\n| transferDto | transferdto | 跨链转账交易表单 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         time | long | 创建时间 | 否 |\n|         remark | string | 交易备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建转账交易所需手续费 - /api/accountledger/calcTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"addressCount\" : 0,\n \"fromLength\" : 0,\n \"toLength\" : 0,\n \"remark\" : null,\n \"price\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/calcTransferTxFee","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/calcTransferTxFee"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"计算离线创建跨链转账交易所需手续费 - /api/accountledger/calcCrossTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"addressCount\" : 0,\n \"fromLength\" : 0,\n \"toLength\" : 0,\n \"remark\" : null,\n \"price\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/calcCrossTxFee","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/calcCrossTxFee"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------:| ------- |:----:|\n| TransferTxFeeDto | transfertxfeedto | 转账交易手续费 | 是 |\n|         addressCount | int | 转账地址数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"多签账户离线组装转账交易 - /api/accountledger/createMultiSignTransferTxOffline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"pubKeys\" : [ ],\n \"minSigns\" : 0,\n \"inputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n } ],\n \"outputs\" : [ {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"lockTime\" : 0\n } ],\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/createMultiSignTransferTxOffline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/createMultiSignTransferTxOffline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| ---------- |:----:|\n| transferDto | multisigntransferdto | 多签账户转账交易表单 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n|         inputs | list<object> | 转账交易输入列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         outputs | list<object> | 转账交易输出列表 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 lockTime | long | 锁定时间 | 是 |\n|         remark | string | 交易备注 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------------ |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化16进制字符串 |\n"},"response":[]},{"name":"计算离线创建多签账户转账交易所需手续费 - /api/accountledger/calcMultiSignTransferTxFee","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"pubKeyCount\" : 0,\n \"fromLength\" : 0,\n \"toLength\" : 0,\n \"remark\" : null,\n \"price\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/accountledger/calcMultiSignTransferTxFee","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/accountledger/calcMultiSignTransferTxFee"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-------------------------:| ------------- |:----:|\n| MultiSignTransferTxFeeDto | multisigntransfertxfeedto | 多签账户转账交易手续费表单 | 是 |\n|         pubKeyCount | int | 多签地址对应公钥数量 | 是 |\n|         fromLength | int | 转账输入长度 | 是 |\n|         toLength | int | 转账输出长度 | 是 |\n|         remark | string | 交易备注 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ----- |\n| value | string | 交易手续费 |\n"},"response":[]},{"name":"发布合约 - /api/contract/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"password\" : null,\n \"remark\" : null,\n \"contractCode\" : null,\n \"alias\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:--------------:| -------------------- |:----:|\n| 发布合约 | contractcreate | 发布合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         password | string | 交易创建者账户密码 | 是 |\n|         remark | string | 备注 | 否 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         alias | string | 合约别名 | 是 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------- |\n| txHash | string | 发布合约的交易hash |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"调用合约 - /api/contract/call","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"password\" : null,\n \"remark\" : null,\n \"contractAddress\" : null,\n \"value\" : null,\n \"multyAssetValues\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/call","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/call"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:------------:| ------------------------------------------------------------------------- |:----:|\n| 调用合约 | contractcall | 调用合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         password | string | 交易创建者账户密码 | 是 |\n|         remark | string | 备注 | 否 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 是 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 调用合约的交易hash |\n"},"response":[]},{"name":"删除合约 - /api/contract/delete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"contractAddress\" : null,\n \"password\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/delete","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/delete"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:--------------:| --------- |:----:|\n| 删除合约 | contractdelete | 删除合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         password | string | 交易创建者账户密码 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ----------- |\n| txHash | string | 删除合约的交易hash |\n"},"response":[]},{"name":"合约token转账 - /api/contract/tokentransfer","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"password\" : null,\n \"toAddress\" : null,\n \"contractAddress\" : null,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/tokentransfer","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/tokentransfer"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:---------------------:| ------------ |:----:|\n| token转账 | contracttokentransfer | token转账表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         password | string | 转出者账户地址密码 | 是 |\n|         toAddress | string | 转入者账户地址 | 是 |\n|         contractAddress | string | 合约地址 | 是 |\n|         amount | biginteger | 转出的token资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"从账户地址向合约地址转账(主链资产)的合约交易 - /api/contract/transfer2contract","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"password\" : null,\n \"toAddress\" : null,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/transfer2contract","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/transfer2contract"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:----------------:| --------- |:----:|\n| 向合约地址转账 | contracttransfer | 向合约地址转账表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         password | string | 转出者账户地址密码 | 是 |\n|         toAddress | string | 转入的合约地址 | 是 |\n|         amount | biginteger | 转出的主链资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| ------ |\n| txHash | string | 交易hash |\n"},"response":[]},{"name":"获取账户地址的指定合约的token余额 - /api/contract/balance/token/{contractAddress}/{address}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/contract/balance/token/{contractAddress}/{address}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/balance/token/{contractAddress}/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------- |:------:| ---- |:----:|\n| contractAddress | string | 合约地址 | 是 |\n| address | string | 账户地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| ----------------------- |\n| contractAddress | string | 合约地址 |\n| name | string | token名称 |\n| symbol | string | token符号 |\n| amount | string | token可用数量 |\n| lockAmount | string | token锁定数量 |\n| decimals | long | token支持的小数位数 |\n| blockHeight | long | 合约创建时的区块高度 |\n| status | int | 合约状态(0-不存在, 1-正常, 2-终止) |\n"},"response":[]},{"name":"获取智能合约详细信息 - /api/contract/info/{address}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/contract/info/{address}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/info/{address}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------- |:------:| ---- |:----:|\n| address | string | 合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------------------------------ |\n| createTxHash | string | 发布合约的交易hash |\n| address | string | 合约地址 |\n| creater | string | 合约创建者地址 |\n| alias | string | 合约别名 |\n| createTime | long | 合约创建时间（单位：秒） |\n| blockHeight | long | 合约创建时的区块高度 |\n| isDirectPayable | boolean | 是否接受直接转账 |\n| directPayableByOtherAsset | boolean | 是否接受其他资产直接转账 |\n| tokenType | int | token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n| nrc20TokenName | string | NRC20-token名称 |\n| nrc20TokenSymbol | string | NRC20-token符号 |\n| decimals | long | NRC20-token支持的小数位数 |\n| totalSupply | string | NRC20-token发行总量 |\n| status | string | 合约状态（not_found, normal, stop） |\n| method | list<object> | 合约方法列表 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取智能合约执行结果 - /api/contract/result/{hash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/contract/result/{hash}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/result/{hash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---- |:------:| ------ |:----:|\n| hash | string | 交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| success | boolean | 合约执行是否成功 |\n| errorMessage | string | 执行失败信息 |\n| contractAddress | string | 合约地址 |\n| result | string | 合约执行结果 |\n| gasLimit | long | GAS限制 |\n| gasUsed | long | 已使用GAS |\n| price | long | GAS单价 |\n| totalFee | string | 交易总手续费 |\n| txSizeFee | string | 交易大小手续费 |\n| actualContractFee | string | 实际执行合约手续费 |\n| refundFee | string | 合约返回的手续费 |\n| value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n| stackTrace | string | 异常堆栈踪迹 |\n| transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|         txHash | string | 合约生成交易：合约转账交易hash |\n|         from | string | 转出的合约地址 |\n|         value | string | 转账金额 |\n|         assetChainId | int | 转账金额资产链ID |\n|         assetId | int | 转账金额资产ID |\n|         outputs | list<object> | 转入的地址列表 |\n|                 to | string | 转入地址 |\n|                 value | string | 转入金额 |\n|                 assetChainId | int | 转入金额资产链ID |\n|                 assetId | int | 转入金额资产ID |\n|                 lockTime | long | 转入金额锁定时间 |\n|         orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n| events | list<string> | 合约事件列表 |\n| debugEvents | list<string> | 调式合约事件列表 |\n| tokenTransfers | list<object> | 合约token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         value | string | 转账金额 |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n|         decimals | long | token支持的小数位数 |\n| token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|         contractAddress | string | 合约地址 |\n|         from | string | 付款方 |\n|         to | string | 收款方 |\n|         tokenId | string | tokenId |\n|         name | string | token名称 |\n|         symbol | string | token符号 |\n| invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|         cmdName | string | 命令名称 |\n|         args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|         cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|         newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n| contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n| remark | string | 备注 |\n"},"response":[]},{"name":"获取智能合约执行结果列表 - /api/contract/result/list","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"hashList\" : [ ]\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/result/list","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/result/list"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:----------------------:| -------------- |:----:|\n| 获取智能合约执行结果列表 | contractresultlistform | 获取智能合约执行结果列表表单 | 是 |\n|         hashList | list<string> | 交易hash列表 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:---------------:| ------------------------------------------- |\n| hash1 or hash2 or hash3... | object | 以交易hash列表中的hash值作为key，这里的key name是动态的 |\n|         success | boolean | 合约执行是否成功 |\n|         errorMessage | string | 执行失败信息 |\n|         contractAddress | string | 合约地址 |\n|         result | string | 合约执行结果 |\n|         gasLimit | long | GAS限制 |\n|         gasUsed | long | 已使用GAS |\n|         price | long | GAS单价 |\n|         totalFee | string | 交易总手续费 |\n|         txSizeFee | string | 交易大小手续费 |\n|         actualContractFee | string | 实际执行合约手续费 |\n|         refundFee | string | 合约返回的手续费 |\n|         value | string | 调用者向合约地址转入的主网资产金额，没有此业务时则为0 |\n|         stackTrace | string | 异常堆栈踪迹 |\n|         transfers | list<object> | 合约转账列表（从合约转出主资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         multyAssetTransfers | list<object> | 合约转账列表（从合约转出其他资产） |\n|                 txHash | string | 合约生成交易：合约转账交易hash |\n|                 from | string | 转出的合约地址 |\n|                 value | string | 转账金额 |\n|                 assetChainId | int | 转账金额资产链ID |\n|                 assetId | int | 转账金额资产ID |\n|                 outputs | list<object> | 转入的地址列表 |\n|                         to | string | 转入地址 |\n|                         value | string | 转入金额 |\n|                         assetChainId | int | 转入金额资产链ID |\n|                         assetId | int | 转入金额资产ID |\n|                         lockTime | long | 转入金额锁定时间 |\n|                 orginTxHash | string | 调用合约交易hash（源交易hash，合约交易由调用合约交易派生而来） |\n|         events | list<string> | 合约事件列表 |\n|         debugEvents | list<string> | 调式合约事件列表 |\n|         tokenTransfers | list<object> | 合约token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 value | string | 转账金额 |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|                 decimals | long | token支持的小数位数 |\n|         token721Transfers | list<object> | 合约NRC721-token转账列表 |\n|                 contractAddress | string | 合约地址 |\n|                 from | string | 付款方 |\n|                 to | string | 收款方 |\n|                 tokenId | string | tokenId |\n|                 name | string | token名称 |\n|                 symbol | string | token符号 |\n|         invokeRegisterCmds | list<object> | 合约调用外部命令的调用记录列表 |\n|                 cmdName | string | 命令名称 |\n|                 args | map | 命令参数，参数不固定，依据不同的命令而来，故此处不作描述，结构为 {参数名称=参数值} |\n|                 cmdRegisterMode | string | 注册的命令模式（QUERY\\_DATA or NEW\\_TX） |\n|                 newTxHash | string | 生成的交易hash（当调用的命令模式是 NEW\\_TX 时，会生成交易） |\n|         contractTxList | list<string> | 合约生成交易的序列化字符串列表 |\n|         remark | string | 备注 |\n"},"response":[]},{"name":"获取合约代码构造函数 - /api/contract/constructor","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractCode\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/constructor","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/constructor"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:------------:| -------------------- |:----:|\n| 获取合约代码构造函数 | contractcode | 获取合约代码构造函数表单 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------------------------------------------------------- |:---------------:| ------------------ |\n| constructor | object | 合约构造函数详情 |\n|         name | string | 方法名称 |\n|         desc | string | 方法描述 |\n|         args | list<object> | 方法参数列表 |\n|                 type | string | 参数类型 |\n|                 name | string | 参数名称 |\n|                 required | boolean | 是否必填 |\n|         returnArg | string | 返回值类型 |\n|         view | boolean | 是否视图方法（调用此方法数据不上链） |\n|         event | boolean | 是否是事件 |\n|         payable | boolean | 是否是可接受主链资产转账的方法 |\n|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 |\n|         jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n| isNrc20 | boolean | 是否是NRC20合约 |\n"},"response":[]},{"name":"获取已发布合约指定函数的信息 - /api/contract/method","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/method","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/method"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:------------------:| ------------------------ |:----:|\n| 获取已发布合约指定函数的信息 | contractmethodform | 获取已发布合约指定函数的信息表单 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------------------------------------------------------- |:---------------:| ------------------ |\n| name | string | 方法名称 |\n| desc | string | 方法描述 |\n| args | list<object> | 方法参数列表 |\n|         type | string | 参数类型 |\n|         name | string | 参数名称 |\n|         required | boolean | 是否必填 |\n| returnArg | string | 返回值类型 |\n| view | boolean | 是否视图方法（调用此方法数据不上链） |\n| event | boolean | 是否是事件 |\n| payable | boolean | 是否是可接受主链资产转账的方法 |\n| payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 |\n| jsonSerializable | boolean | 方法返回值是否JSON序列化 |\n"},"response":[]},{"name":"获取已发布合约指定函数的参数类型列表 - /api/contract/method/argstypes","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/method/argstypes","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/method/argstypes"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:------------------:| ------------------------ |:----:|\n| 获取已发布合约指定函数的参数类型列表 | contractmethodform | 获取已发布合约指定函数的参数类型表单 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --- |:---------------:| ---- |\n| 返回值 | list<string> | |\n"},"response":[]},{"name":"验证发布合约 - /api/contract/validate/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"contractCode\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/validate/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/validate/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:----------------------:| -------------------- |:----:|\n| 验证发布合约 | contractvalidatecreate | 验证发布合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证调用合约 - /api/contract/validate/call","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"value\" : 0,\n \"multyAssetValues\" : null,\n \"gasLimit\" : 0,\n \"price\" : 0,\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/validate/call","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/validate/call"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:--------------------:| ------------------------------------------------------------------------- |:----:|\n| 验证调用合约 | contractvalidatecall | 验证调用合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         value | long | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 否 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n|         gasLimit | long | 最大gas消耗 | 是 |\n|         price | long | 执行合约单价 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名称 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"验证删除合约 - /api/contract/validate/delete","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"contractAddress\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/validate/delete","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/validate/delete"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:----------------------:| -------- |:----:|\n| 验证删除合约 | contractvalidatedelete | 验证删除合约表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------- |:-------:| --------- |\n| success | boolean | 验证成功与否 |\n| code | string | 验证失败的错误码 |\n| msg | string | 验证失败的错误信息 |\n"},"response":[]},{"name":"估算发布合约交易的GAS - /api/contract/imputedgas/create","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"contractCode\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/imputedgas/create","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/imputedgas/create"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------ |:------------------------:| -------------------- |:----:|\n| 估算发布合约交易的GAS | imputedgascontractcreate | 估算发布合约交易的GAS表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"估算调用合约交易的GAS - /api/contract/imputedgas/call","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"value\" : null,\n \"multyAssetValues\" : null,\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/imputedgas/call","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/imputedgas/call"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:----------------------:| ------------------------------------------------------------------------- |:----:|\n| 估算调用合约交易的GAS | imputedgascontractcall | 估算调用合约交易的GAS表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 否 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\]] | 否 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名称 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| -------- |:----:| ----------------- |\n| gasLimit | long | 消耗的gas值，执行失败返回数值1 |\n"},"response":[]},{"name":"调用合约不上链方法 - /api/contract/view","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"contractAddress\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/view","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/view"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:----------------:| ------------------------ |:----:|\n| 调用合约不上链方法 | contractviewcall | 调用合约不上链方法表单 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         methodName | string | 方法名称 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:------:| --------- |\n| result | string | 视图方法的调用结果 |\n"},"response":[]},{"name":"离线组装 - 发布合约的交易 - /api/contract/create/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"alias\" : null,\n \"contractCode\" : null,\n \"gasLimit\" : 0,\n \"args\" : null,\n \"argsType\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/create/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/create/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------- |:---------------------:| -------------------- |:----:|\n| 发布合约离线交易 | contractcreateoffline | 发布合约离线交易表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         senderBalance | biginteger | 账户余额 | 是 |\n|         nonce | string | 账户nonce值 | 是 |\n|         alias | string | 合约别名 | 是 |\n|         contractCode | string | 智能合约代码(字节码的Hex编码字符串) | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         args | object[] | 参数列表 | 否 |\n|         argsType | string[] | 参数类型列表 | 否 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------------- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n| contractAddress | string | 生成的合约地址 |\n"},"response":[]},{"name":"离线组装 - 调用合约的交易 - /api/contract/call/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"contractAddress\" : null,\n \"gasLimit\" : 0,\n \"value\" : null,\n \"multyAssetValues\" : null,\n \"methodName\" : null,\n \"methodDesc\" : null,\n \"args\" : null,\n \"argsType\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/call/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/call/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ---------------------------------------------------------------- |:-------------------:| ----------------------------------------------------------------------------------- |:----:|\n| 调用合约离线交易 | contractcalloffline | 调用合约离线交易表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         senderBalance | biginteger | 账户余额 | 是 |\n|         nonce | string | 账户nonce值 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         value | biginteger | 调用者向合约地址转入的主网资产金额，没有此业务时填0 | 是 |\n|         multyAssetValues | string[][] | 调用者向合约地址转入的其他资产金额，没有此业务时填空，规则: [[\\,\\,\\,\\]] | 否 |\n|         methodName | string | 方法名 | 是 |\n|         methodDesc | string | 方法描述，若合约内方法没有重载，则此参数可以为空 | 否 |\n|         args | object[] | 参数列表 | 否 |\n|         argsType | string[] | 参数类型列表 | 否 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 删除合约交易 - /api/contract/delete/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"sender\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"contractAddress\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/delete/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/delete/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:---------------------:| ---------- |:----:|\n| 删除合约离线交易 | contractdeleteoffline | 删除合约离线交易表单 | 是 |\n|         sender | string | 交易创建者 | 是 |\n|         senderBalance | biginteger | 账户余额 | 是 |\n|         nonce | string | 账户nonce值 | 是 |\n|         contractAddress | string | 智能合约地址 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 合约token转账交易 - /api/contract/tokentransfer/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"toAddress\" : null,\n \"contractAddress\" : null,\n \"gasLimit\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/tokentransfer/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/tokentransfer/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------------- |:----------------------------:| ------------- |:----:|\n| token转账离线交易 | contracttokentransferoffline | token转账离线交易表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         senderBalance | biginteger | 转出者账户余额 | 是 |\n|         nonce | string | 转出者账户nonce值 | 是 |\n|         toAddress | string | 转入者账户地址 | 是 |\n|         contractAddress | string | 合约地址 | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         amount | biginteger | 转出的token资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 从账户地址向合约地址转账(主链资产)的合约交易 - /api/contract/transfer2contract/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"fromAddress\" : null,\n \"senderBalance\" : null,\n \"nonce\" : null,\n \"toAddress\" : null,\n \"gasLimit\" : 0,\n \"amount\" : null,\n \"remark\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/contract/transfer2contract/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/contract/transfer2contract/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------- |:-----------------------:| ------------- |:----:|\n| 向合约地址转账离线交易 | contracttransferoffline | 向合约地址转账离线交易表单 | 是 |\n|         fromAddress | string | 转出者账户地址 | 是 |\n|         senderBalance | biginteger | 转出者账户余额 | 是 |\n|         nonce | string | 转出者账户nonce值 | 是 |\n|         toAddress | string | 转入的合约地址 | 是 |\n|         gasLimit | long | GAS限制 | 是 |\n|         amount | biginteger | 转出的主链资产金额 | 是 |\n|         remark | string | 备注 | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"创建共识节点 - /api/consensus/agent","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentAddress\" : null,\n \"packingAddress\" : null,\n \"rewardAddress\" : null,\n \"commissionRate\" : 0,\n \"deposit\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/agent","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/agent"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------------- |:---------------:| ----------- |:----:|\n| CreateAgentForm | createagentform | 创建共识节点表单 | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 奖励地址，默认节点地址 | 否 |\n|         commissionRate | int | 佣金比例 | 是 |\n|         deposit | string | 抵押金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"注销共识节点 - /api/consensus/agent/stop","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/agent/stop","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/agent/stop"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:-------------:| -------- |:----:|\n| StopAgentForm | stopagentform | 注销共识节点表单 | 是 |\n|         address | string | 共识节点地址 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"委托参与共识 - /api/consensus/deposit","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"agentHash\" : null,\n \"deposit\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/deposit","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/deposit"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-----------:| -------- |:----:|\n| DepositForm | depositform | 委托参与共识表单 | 是 |\n|         address | string | 参与共识账户地址 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         deposit | string | 参与共识的金额 | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"退出共识 - /api/consensus/withdraw","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"txHash\" : null,\n \"password\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/withdraw","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/withdraw"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| -------------------------------------------------------- |:------------:| ------------ |:----:|\n| 退出共识 | withdrawform | 退出共识表单 | 是 |\n|         address | string | 节点地址 | 是 |\n|         txHash | string | 加入共识时的交易hash | 是 |\n|         password | string | 密码 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| ------ |\n| value | string | 交易hash |\n"},"response":[]},{"name":"查询节点的委托共识列表 - /api/consensus/list/deposit/{agentHash}","request":{"method":"GET","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":null},"url":{"raw":"https://api.nuls.io:null/api/consensus/list/deposit/{agentHash}","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/list/deposit/{agentHash}"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------- |:------:| ------------- |:----:|\n| agentHash | string | 创建共识节点的交易hash | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----------- |:------:| --------- |\n| deposit | string | 委托金额 |\n| agentHash | string | 节点hash |\n| address | string | 账户地址 |\n| time | long | 委托时间 |\n| txHash | string | 委托交易hash |\n| blockHeight | long | 委托时的区块高度 |\n| delHeight | long | 退出委托的区块高度 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数生成一个随机种子并返回 - /api/consensus/random/seed/count","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"height\" : 0,\n \"count\" : 0,\n \"algorithm\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/random/seed/count","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/random/seed/count"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| --------------------------------------------------------- |:-------------------:| ------------------------- |:----:|\n| RandomSeedCountForm | randomseedcountform | 随机种子表单 | 是 |\n|         height | long | 最大高度 | 是 |\n|         count | int | 原始种子个数 | 是 |\n|         algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据高度区间生成一个随机种子并返回 - /api/consensus/random/seed/height","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"startHeight\" : 0,\n \"endHeight\" : 0,\n \"algorithm\" : null\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/random/seed/height","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/random/seed/height"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:--------------------:| ------------------------- |:----:|\n| RandomSeedHeightForm | randomseedheightform | 随机种子表单 | 是 |\n|         startHeight | long | 起始高度 | 是 |\n|         endHeight | long | 截止高度 | 是 |\n|         algorithm | string | 算法标识：SHA3, KECCAK, MERKLE | 否 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| --------- |:------:| ------- |\n| seed | string | 生成的随机种子 |\n| algorithm | string | 算法标识 |\n| count | int | 原始种子个数 |\n"},"response":[]},{"name":"根据最大高度和原始种子个数查找原始种子列表并返回 - /api/consensus/random/rawseed/count","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"height\" : 0,\n \"count\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/random/rawseed/count","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/random/rawseed/count"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------ |:----------------------:| -------- |:----:|\n| RandomRawSeedCountForm | randomrawseedcountform | 原始随机种子表单 | 是 |\n|         height | long | 最大高度 | 是 |\n|         count | int | 原始种子个数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"根据高度区间查找原始种子列表并返回 - /api/consensus/random/rawseed/height","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"startHeight\" : 0,\n \"endHeight\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/random/rawseed/height","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/random/rawseed/height"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ----------------------------------------------------------- |:-----------------------:| -------- |:----:|\n| RandomRawSeedHeightForm | randomrawseedheightform | 原始随机种子表单 | 是 |\n|         startHeight | long | 起始高度 | 是 |\n|         endHeight | long | 截止高度 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ------ |:---------------:| ---- |\n| 原始种子列表 | list<string> | |\n"},"response":[]},{"name":"离线组装 - 创建共识节点交易 - /api/consensus/agent/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentAddress\" : null,\n \"packingAddress\" : null,\n \"rewardAddress\" : null,\n \"commissionRate\" : 0,\n \"deposit\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/agent/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/agent/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:------------:| ---------- |:----:|\n| ConsensusDto | consensusdto | 离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 注销共识节点交易 - /api/consensus/agent/stop/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentHash\" : null,\n \"agentAddress\" : null,\n \"deposit\" : null,\n \"price\" : null,\n \"depositList\" : [ {\n \"depositHash\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n } ]\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/agent/stop/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/agent/stop/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:----------------:| ----------- |:----:|\n| StopConsensusDto | stopconsensusdto | 离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 委托参与共识交易 - /api/consensus/deposit/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"deposit\" : null,\n \"agentHash\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/deposit/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/deposit/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:----------:| ---------- |:----:|\n| DepositDto | depositdto | 离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 退出共识交易 - /api/consensus/withdraw/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"depositHash\" : null,\n \"price\" : null,\n \"input\" : {\n \"address\" : null,\n \"assetChainId\" : 0,\n \"assetId\" : 0,\n \"amount\" : null,\n \"nonce\" : null\n }\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/withdraw/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/withdraw/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-----------:| ----------- |:----:|\n| WithDrawDto | withdrawdto | 离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"多签账户离线组装 - 创建共识节点交易 - /api/consensus/multiSign/agent/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentAddress\" : null,\n \"packingAddress\" : null,\n \"rewardAddress\" : null,\n \"commissionRate\" : 0,\n \"deposit\" : null,\n \"input\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/multiSign/agent/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/multiSign/agent/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:---------------------:| -------------- |:----:|\n| MultiSignConsensusDto | multisignconsensusdto | 多签账户离线创建共识节点表单 | 是 |\n|         agentAddress | string | 节点创建地址 | 是 |\n|         packingAddress | string | 节点出块地址 | 是 |\n|         rewardAddress | string | 获取共识奖励地址 | 是 |\n|         commissionRate | int | 节点佣金比例 | 是 |\n|         deposit | biginteger | 创建节点保证金 | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户委托参与共识交易 - /api/consensus/multiSign/deposit/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"deposit\" : null,\n \"agentHash\" : null,\n \"input\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/multiSign/deposit/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/multiSign/deposit/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:-------------------:| -------------- |:----:|\n| MultiSignDepositDto | multisigndepositdto | 多签账户离线委托参与共识表单 | 是 |\n|         address | string | 账户地址 | 是 |\n|         deposit | biginteger | 委托金额 | 是 |\n|         agentHash | string | 共识节点hash | 是 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户退出共识交易 - /api/consensus/multiSign/withdraw/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"address\" : null,\n \"depositHash\" : null,\n \"price\" : null,\n \"input\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/multiSign/withdraw/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/multiSign/withdraw/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------ |:--------------------:| ------------ |:----:|\n| WithDrawDto | multisignwithdrawdto | 多签账户离线退出共识表单 | 是 |\n|         address | string | 地址 | 是 |\n|         depositHash | string | 委托共识交易的hash | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         input | object | 交易输入信息 | 是 |\n|                 address | string | 账户地址 | 是 |\n|                 assetChainId | int | 资产的链id | 是 |\n|                 assetId | int | 资产id | 是 |\n|                 amount | biginteger | 资产金额 | 是 |\n|                 nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]},{"name":"离线组装 - 多签账户注销共识节点交易 - /api/consensus/multiSign/agent/stop/offline","request":{"method":"POST","header":[{"key":"Content-Type","name":"Content-Type","value":"application/json;charset=UTF-8","type":"text"}],"body":{"mode":"raw","raw":"{\n \"agentHash\" : null,\n \"agentAddress\" : null,\n \"deposit\" : null,\n \"price\" : null,\n \"depositList\" : null,\n \"pubKeys\" : [ ],\n \"minSigns\" : 0\n}"},"url":{"raw":"https://api.nuls.io:null/api/consensus/multiSign/agent/stop/offline","protocol":"https","host":["api.nuls.io"],"port":null,"path":["api/consensus/multiSign/agent/stop/offline"]},"description":"\n\n#### 参数列表\n| 参数名 | 参数类型 | 参数描述 | 是否必填 |\n| ------------------------------------------------------------------------------------------------------------------------------------------------------------ |:-------------------------:| -------------- |:----:|\n| StopConsensusDto | multisignstopconsensusdto | 多签账户离线注销共识节点表单 | 是 |\n|         agentHash | string | 创建节点的交易hash | 是 |\n|         agentAddress | string | 节点地址 | 是 |\n|         deposit | biginteger | 创建节点的保证金 | 是 |\n|         price | biginteger | 手续费单价 | 否 |\n|         depositList | list<object> | 停止委托列表 | 是 |\n|                 depositHash | string | 委托共识的交易hash | 是 |\n|                 input | object | 交易输入信息 | 是 |\n|                         address | string | 账户地址 | 是 |\n|                         assetChainId | int | 资产的链id | 是 |\n|                         assetId | int | 资产id | 是 |\n|                         amount | biginteger | 资产金额 | 是 |\n|                         nonce | string | 资产nonce值 | 是 |\n|         pubKeys | list<string> | 公钥集合 | 是 |\n|         minSigns | int | 最小签名数 | 是 |\n\n#### 返回值\n| 字段名 | 字段类型 | 参数描述 |\n| ----- |:------:| -------- |\n| hash | string | 交易hash |\n| txHex | string | 交易序列化字符串 |\n"},"response":[]}]} \ No newline at end of file diff --git a/module/nuls-api/documents/nuls-api_RESTFUL.md b/module/nuls-api/documents/nuls-api_RESTFUL.md index 7397c2ce81..ed95661a95 100644 --- a/module/nuls-api/documents/nuls-api_RESTFUL.md +++ b/module/nuls-api/documents/nuls-api_RESTFUL.md @@ -8,12 +8,12 @@ ## 设置 -​ `NULS-API`模块默认访问的端口号是8004，可以在nuls.ncf配置文件中做修改，如下： +​ `NULS-API`模块默认访问的端口号是18004，可以在nuls.ncf配置文件中做修改，如下： ``` [nuls-API] #httpServer的启动port -serverPort=8004 +serverPort=18004 ``` ## 说明 @@ -24,41 +24,23 @@ serverPort=8004 `NULS-API`模块提供了若干在线接口和离线接口。 -#### 在线接口 +在线接口：钱包必须正常运行，且能够连接网络中的其他节点，能够正常同步区块和广播数据。在调用在线接口之前，最好是已经同步到最新区块。接口所产生的数据都会保存在钱包中。例如创建账户、修改密码、转账、获取区块头等。 -即需要访问节点钱包API，才能得到正确的返回结果。访问在线接口有以下几点要求： +离线接口：NULS2.0提供了一个专门用于[离线操作的NULS-API工具](http://nuls-cn.oss-cn-hangzhou.aliyuncs.com/2.1/NULS_API-offline_v2.0.0.tar.gz)。无需安装钱包，可独立运行在一台没有连接网络的服务器上。用户通过调用离线接口，传入相关的参数，获取返回值，相应数据不会存入钱包。例如离线创建账户、离线组装转账交易、离线签名等。 -- 需安装节点钱包且必须正常运行。 -- 节点钱包能够连接网络中的其他节点，能够正常同步区块和广播数据。 -- 在调用在线接口之前，节点钱包最好是已经同步到最新区块。 +### 字段描述 -在线接口所产生的数据都会保存在钱包中。例如创建账户、修改密码、转账交易、获取区块头等。 +**链的chainId:** -#### 离线接口 +​ NULS2.0支持多链并行和跨链转账，每条链通过链ID来区分，NULS主网的链ID为1，NULS测试网的链ID为2。 -NULS2.0提供了一个专门用于[离线操作的NULS-API工具](http://nuls-cn.oss-cn-hangzhou.aliyuncs.com/2.1/NULS_API-offline_v2.0.0.tar.gz)。无需安装钱包，可独立运行在一台没有连接网络的服务器上。用户通过调用离线接口，传入相关的参数，获取返回值，相应数据不会存入钱包。例如离线创建账户、离线组装转账交易、离线签名等。 +**链的资产：** -### 字段与业务描述 +​ NULS2.0支持每条链除了默认的资产外，可根据业务需要，动态添加资产。每条链的每种资产通过链ID和资产ID的复合主键来区分。例如NULS主网的NULS，chainId=1,assetId=1 -#### 链的chainId +**交易的type值：** -​ NULS2.0支持多链并行和跨链转账，每条链通过链ID（chainId）来区分，NULS主网的链ID为1，NULS测试网的链ID为2。 - -#### 链的资产 - -​ NULS2.0还支持多资产，每条链除了默认的资产外，可根据业务需要，动态添加资产。每种资产通过链ID（chainId）和资产ID（assetId）的复合主键来区分。例如NULS主网的NULS资产（chainId=1,assetId=1） - -​ **主资产：每条链的默认资产就是主资产，交易手续费只收取本链主资产。** - -#### 合约资产 - -​ NULS2.0内置智能合约，用户可以通过NULS官方提供的标准NRC20合约模板发布合约资产(token)，每发布一个合约资产都有唯一合约地址作为标记。 - -​ 这里需要注意的是合约资产并不等于链的资产，链的资产是会在链上分配有chainId和assetId属性的，而合约资产并没有。 - -#### 交易类型 - -NULS2.0默认有多种交易，每种交易的功能不同，调用接口查询交易详情时，可通过交易类型字段（type）来区分不同交易类型，以下是交易类型的枚举值： +​ NULS2.0默认有多种交易，每种交易的功能不同，调用接口查询交易详情时，可通过type字段来区分不同交易类型，以下是交易类型的枚举值： ``` int COIN_BASE = 1; // coinBase出块奖励 @@ -86,130 +68,17 @@ int CONTRACT_CANCEL_DEPOSIT = 22; // 合约取消委托共识 int CONTRACT_STOP_AGENT = 23; // 合约注销共识节点 int VERIFIER_CHANGE = 24; // 验证人变更 int VERIFIER_INIT = 25; //验证人初始化 -int CONTRACT_TOKEN_CROSS_TRANSFER = 26; // 合约跨链转账 ``` -#### 转账 - -​ 转账交易分为4种：**普通转账、跨链转账、合约转账、合约跨链转账。**其中普通转账和跨链转账针对是链上资产（分配有chainId和assetId）。后两者针对合约token的转账。 - -​ **普通转账（type=2）：**也叫链内转账，交易支持多对多的转账操作。多对多有两层含义，一是资产可以是多个，二是转账地址可以是多个。转账人、转账资产、转账金额都体现在交易的from和to里，后面会详细说明。 - -​ **跨链转账（type=10）：**跨链转账是指将链上资产跨链转到别的NULS平行链上去。同普通转账一样，也支持多对多的转账操作，体现在交易的from和to里。 - -​ **合约转账（type=16）：**合约转账只支持合约token的链内转账，它实际上是通过调用智能合约完成的。交易的from和to里只包含手续费。 - -​ **合约跨链转账（type=26）：**合约的跨链转账，也是通过调用智能合约完成的。但是节点在打包区块解析智能合约后，系统内部生成一个type=10的跨链交易，一同打包到区块内。所以实际上合约跨链转账是通过两个交易来实现。 - -#### 交易的from和to +**交易的from和to：** 用转账交易为例：tx.type = 2 -``` -tx:{ - "hash": "9c10fdf7162b00ac9a0972fcdc81c68d4f41383f025196a4207372e78acc9a3f", //交易ID - "type": 2, - "from": [ - { - "address": "NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 1 - "assetsId": 1, - "amount": "100000100000", - "nonce": "86f0ae38296c6b9d", - "locked": 0 - } - ], - "to": [ - { - "address": "NULSeBaMnAh6nquK1PARuRzKVk5LcfmFEAu7X", - "assetsChainId": 1, - "assetsId": 1, - "amount": "100000000000", - "lockTime": 0 - } - ] -} -``` - -​ **from：**转账交易的转出方，每一个from视为一个地址的某一种资产转出多少数量。通过assetsChainId和assetsId确定某一个具体资产，address为转出地址，amount为转出数量。其中nonce值每次转账后都会改变，防止打包时出现双花，可通过调用查询账户余额接口获取当前最新nonce值。 - -​ **to：**转账交易的接收方，每一个to视为接收人接收到某一种资产多少数量，其中lockTime字段为锁定时间。当lockTime=0时，表示资产可以正常使用；当锁定时间大于0时，表示只有当现实时间（时间戳）超过这个值之后，这笔资产才能正常使用；当lockTime =-1时，表示永久锁定中，需要特殊的交易才能解除锁定，例如参与委托共识和取消委托共识。 - -#### 资产的永久锁定与解锁 - -​ NULS里支持特殊的交易将链上的资产永久锁定，通常这种永久锁定交易都是成对出现，再通过另一个交易解除锁定，从而实现一些复杂的业务逻辑。我们用委托参与共识交易（type=5）和退出取消委托共识（type=6）来举例说明。 - -**委托参与共识交易：** - -``` -tx:{ - "hash": "fce936c045d2f200598db030105ecce20fdf09f672897d4e0e18f6d8bd9dc023", //交易ID - "type": 5, - "from": [ - { - "address": "NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 1, - "assetsId": 1, - "amount": "100000100000", - "nonce": "207372e78acc9a3f", - "locked": 0 - } - ], - "to": [ - { - "address": "NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 1, - "assetsId": 1, - "amount": "100000000000", - "lockTime": -1 - } - ] -} -``` - -这个交易里type=5，from和to的地址相同，都是NULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS，且to的lockTime = -1。表示自己通过委托共识交易永久锁定了部分资产,去参与共识获得出块奖励。 - -**取消委托共识交易：** - -``` -tx:{ - "hash": "ff6596e2489c591efa94eab27e082f902bc5fefb529416e00cd736a34029c08c", //交易ID - "type": 6, - "from": [ - { - "address": "tNULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 2, - "assetsId": 1, - "amount": "100000000000", //必须和锁定时的金额一致 - "nonce": "0e18f6d8bd9dc023", //必须是锁定交易的hash后8位 - "locked": -1 - } - ], - "to": [ - { - "address": "tNULSeBaMotPhSFTjU9UxmzS8uToKezBSSYUxS", - "assetsChainId": 2, - "assetsId": 1, - "amount": "99999900000", - "lockTime": 0 - } - ] -} -``` - -这个交易里from的locked = -1，表示为需要解锁一笔资产。需要注意的是，解锁交易的from必须和之前锁定交易的to保持一致，即assetsChainId、assetsId、amount值一样。nonce值则是之前锁定交易hash的后8位。 - -#### 交易手续费 - -​ 交易手续费 ：from里本链主资产之和 - to里本链主资产之和。 - -​ 手续费单价： - -​ 转账交易（type=2）：0.001NULS/KB - -​ 其他交易：0.01NULS/KB +​ from为转账交易的转出方，每一个from视为一个转账人的某一种资产转出多少数量，其中nonce值每次转账后都会改变，可通过调用查询账户余额接口获取当前最新nonce值。 +​ to为转账交易的接收方，每一个to视为接收人接收到某一种资产多少数量，其中lockTime为锁定时间。当锁定时间大于0时，表示现实时间超过这个值之后，这笔资产才能正常使用；当lockTime =-1时，表示永久锁定中，需要特殊的交易才能解除锁定，例如参与委托共识和取消委托共识。 +​ 交易的手续费 = from里本链主资产之和 - to里本链主资产之和 ## 访问方式 @@ -309,16 +178,15 @@ _**request form data:**_ ``` ### 1.1 批量创建账户 -#### Cmd: /api/account +#### Cmd: /api/account/multiSign/aliasTx/create _**详细描述: 创建的账户存在于本地钱包内**_ #### HttpMethod: POST #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------- | :------: | -------------------------- | :------: | -| form | | 表单 | -- | -| count | string | 新建账户数量,取值[1-10000] | 是 | -| password | string | 账户密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------- |:------:| ------------------ |:----:| +| count | string | 新建账户数量,取值[1-10000] | 是 | +| password | string | 账户密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -327,14 +195,18 @@ _**详细描述: 创建的账户存在于本地钱包内**_ #### Example request data: _**request path:**_ -/api/account +/api/account/multiSign/aliasTx/create _**request form data:**_ ```json { - "count" : 1, - "password" : "abcd1234" + "address" : "tNULSeBaNLp2p5hhAapaZz7AYXw6Ysw5t4Ph8M", + "alias" : "taksk2", + "nonce" : "0000000000000000", + "remark" : "", + "pubKeys" : [ "026f5ba56158da0b5ff545c1016ee2a00d9302fbcd6e0e3f3a8cacc8a3a6e19f54", "03245193eaef6f91de9444ffcc48c9944e140337ba1f855a1d6d2a98e3bf048053" ], + "minSigns" : 2 } ``` @@ -344,7 +216,8 @@ _**request form data:**_ { "success" : true, "data" : { - "list" : [ "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG" ] + "txHex" : "03009d77775d001f170200038783e2c78cbe6aca9298f83952ea56518ec577300674616b736b328c01170200038783e2c78cbe6aca9298f83952ea56518ec57730020001004023050600000000000000000000000000000000000000000000000000000000080000000000000000000117020001e2f297763765bc154afaac7aec5e7899a729fed20200010000e1f50500000000000000000000000000000000000000000000000000000000000000000000000046020221026f5ba56158da0b5ff545c1016ee2a00d9302fbcd6e0e3f3a8cacc8a3a6e19f542103245193eaef6f91de9444ffcc48c9944e140337ba1f855a1d6d2a98e3bf048053", + "hash" : "eb23f03966a31538edc648fa68040828ff2b0b18de6d575245118540e3b0a054" } } ``` @@ -364,12 +237,12 @@ _**详细描述: 修改账户密码**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ----------------------------------------------------------- | :------: | -------- | :------: | -| address | string | 账户地址 | 是 | -| form | | 表单 | -- | -|         password | string | 原始密码 | 是 | -|         newPassword | string | 新密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ----------------------------------------------------------- |:-------------------------:| -------- |:----:| +| address | string | 账户地址 | 是 | +| form | accountupdatepasswordform | 账户密码信息表单 | 是 | +|         password | string | 原始密码 | 是 | +|         newPassword | string | 新密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -414,11 +287,11 @@ _**详细描述: 只能导出本地钱包已存在账户的私钥**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :------: | -------- | :------: | -| address | string | 账户地址 | 是 | -| form | | 表单 | -- | -|         password | string | 密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:-------------------:| -------- |:----:| +| address | string | 账户地址 | 是 | +| form | accountpasswordform | 账户密码信息表单 | 是 | +|         password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -464,12 +337,12 @@ _**详细描述: 导入私钥时，需要输入密码给明文私钥加密**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| --------------------------------------------------------- | :------: | --------------------------------------------- | :------: | -| form | | 表单 | -- | -|         priKey | string | 私钥 | 是 | -|         password | string | 密码 | 是 | -|         overwrite | boolean | 是否覆盖账户: false:不覆盖导入, true:覆盖导入 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------- |:-------------------------:| ------------------------------ |:----:| +| form | accountprikeypasswordform | 根据私钥导入账户表单 | 是 | +|         priKey | string | 私钥 | 是 | +|         password | string | 密码 | 是 | +|         overwrite | boolean | 是否覆盖账户: false:不覆盖导入, true:覆盖导入 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -507,10 +380,10 @@ _**详细描述: 根据keyStore导入账户**_ #### HttpMethod: POST #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :---------: | ------------ | :------: | -| form | | 表单 | -- | -|         keystore | inputstream | keystore文件 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:-----------:| ---------- |:----:| +| 根据私钥导入账户 | inputstream | 根据私钥导入账户表单 | 是 | +|         根据私钥导入账户 | inputstream | 根据私钥导入账户表单 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -597,15 +470,15 @@ _**详细描述: 根据keystore字符串导入账户**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ------------------------------ | :------: | -| form | | 根据keystore字符串导入账户表单 | -- | -|         keystore | object | keystore字符串 | 是 | -|                 address | string | 账户地址 | 是 | -|                 encryptedPrivateKey | string | 加密后的私钥 | 是 | -|                 pubKey | string | 公钥 | 是 | -|                 prikey | string | 私钥 | 是 | -|         password | string | 密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------------------------------------------------------------- |:-----------------------------:| ------------------- |:----:| +| form | accountkeystorejsonimportform | 根据keystore字符串导入账户表单 | 是 | +|         keystore | object | keystore字符串 | 是 | +|                 address | string | 账户地址 | 是 | +|                 encryptedPrivateKey | string | 加密后的私钥 | 是 | +|                 pubKey | string | 公钥 | 是 | +|                 prikey | string | 私钥 | 是 | +|         password | string | 密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -657,12 +530,12 @@ _**详细描述: 账户备份，导出AccountKeyStore文件到指定目录**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :------: | -------- | :------: | -| address | string | 账户地址 | 是 | -| form | | 表单 | -- | -|         password | string | 密码 | 是 | -|         path | string | 文件路径 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:---------------------:| -------------- |:----:| +| address | string | 账户地址 | 是 | +| form | accountkeystorebackup | keystone导出信息表单 | 是 | +|         password | string | 密码 | 是 | +|         path | string | 文件路径 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -709,12 +582,12 @@ _**详细描述: 别名格式为1-20位小写字母和数字的组合，设置 ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :------: | -------- | :------: | -| form | -- | 表单 | -- | -|         address | string | 账户地址 | 是 | -|         alias | string | 别名 | 是 | -|         password | string | 账户密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:------------:| -------- |:----:| +| form | setaliasform | 账户设置别名表单 | 是 | +|         address | string | 账户地址 | 是 | +|         alias | string | 别名 | 是 | +|         password | string | 账户密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -761,11 +634,11 @@ _**详细描述: 根据资产链ID和资产ID，查询本链账户对应资产 ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ---------- | :------: | -| balanceDto | -- | 表单 | -- | -|         assetChainId | int | 资产的链ID | 是 | -|         assetId | int | 资产ID | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------ |:-----------:| ------ |:----:| +| balanceDto | balanceform | 账户余额表单 | 是 | +|         assetChainId | int | 资产的链ID | 是 | +|         assetId | int | 资产ID | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -823,11 +696,11 @@ _**详细描述: 验证地址格式是否正确**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------- | :------: | -------- | :------: | -| form | -- | 表单 | -- | -|         chainId | int | 链ID | 是 | -|         address | string | 账户地址 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------- |:-------------------:| -------- |:----:| +| form | validateaddressform | 账户设置别名表单 | 是 | +|         chainId | int | 链ID | 是 | +|         address | string | 账户地址 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -873,11 +746,11 @@ _**详细描述: 根据账户公钥生成账户地址**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| --------------------------------------------------------- | :------: | -------- | :------: | -| form | -- | 表单 | -- | -|         chainId | int | 链ID | 是 | -|         publicKey | string | 账户公钥 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------- |:--------------------:| ------------ |:----:| +| form | accountpublickeyform | 根据账户公钥生成账户地址 | 是 | +|         chainId | int | 链ID | 是 | +|         publicKey | string | 账户公钥 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -925,12 +798,13 @@ _**详细描述: 创建的账户不会保存到钱包中,接口直接返回账 ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :------: | ------------ | :------: | -| form | -- | 表单 | -- | -|         count | int | 新建账户数量 | 是 | -|         prefix | string | 地址前缀 | 否 | -|         password | string | 账户密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:-----------------:| ---------- |:----:| +| form | accountcreateform | 离线批量创建账户表单 | 是 | +|         chainId | int | 链ID | 是 | +|         count | int | 新建账户数量 | 是 | +|         prefix | string | 地址前缀 | 否 | +|         password | string | 账户密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -985,12 +859,12 @@ _**详细描述: 离线获取账户明文私钥**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ------------ | :------: | -| form | -- | 表单 | -- | -|         address | string | 账户地址 | 是 | -|         encryptedPriKey | string | 账户密文私钥 | 是 | -|         password | string | 账户密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------------- |:-------------:| ------------ |:----:| +| form | getprikeyform | 离线获取账户明文私钥表单 | 是 | +|         address | string | 账户地址 | 是 | +|         encryptedPriKey | string | 账户密文私钥 | 是 | +|         password | string | 账户密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1039,13 +913,13 @@ _**详细描述: 离线修改账户密码**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ------------ | :------: | -| form | -- | 表单 | -- | -|         address | string | 账户地址 | 是 | -|         encryptedPriKey | string | 账户密文私钥 | 是 | -|         oldPassword | string | 账户原密码 | 是 | -|         newPassword | string | 账户新密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------------- |:-----------------:| ---------- |:----:| +| form | resetpasswordform | 离线修改账户密码表单 | 是 | +|         address | string | 账户地址 | 是 | +|         encryptedPriKey | string | 账户密文私钥 | 是 | +|         oldPassword | string | 账户原密码 | 是 | +|         newPassword | string | 账户新密码 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1098,15 +972,15 @@ _**详细描述: 用于签名离线组装的多账户转账交易，调用接口 ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :-------------: | ------------------- | :------: | -| form | -- | 表单 | -- | -|         dtoList | list<object> | keystore集合 | 是 | -|                 address | string | 地址 | 是 | -|                 priKey | string | 明文私钥 | 否 | -|                 encryptedPrivateKey | string | 加密私钥 | 否 | -|                 password | string | 密码 | 否 | -|         txHex | string | 交易序列化Hex字符串 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------------------------------------------------------------- |:---------------:| ----------- |:----:| +| form | multisignform | 多账户摘要签名表单 | 是 | +|         dtoList | list<object> | keystore集合 | 是 | +|                 address | string | 地址 | 是 | +|                 priKey | string | 明文私钥 | 否 | +|                 encryptedPrivateKey | string | 加密私钥 | 否 | +|                 password | string | 密码 | 否 | +|         txHex | string | 交易序列化Hex字符串 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1160,12 +1034,12 @@ _**详细描述: 明文私钥摘要签名**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------- | :------: | ------------------- | :------: | -| form | -- | 表单 | -- | -|         txHex | string | 交易序列化Hex字符串 | 是 | -|         address | string | 账户地址 | 是 | -|         priKey | string | 账户明文私钥 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------- |:--------------:| ----------- |:----:| +| form | prikeysignform | 明文私钥摘要签名表单 | 是 | +|         txHex | string | 交易序列化Hex字符串 | 是 | +|         address | string | 账户地址 | 是 | +|         priKey | string | 账户明文私钥 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1181,7 +1055,6 @@ _**request form data:**_ ```json { - "chainId":1, "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f0000000000000000000000000000000000000000000000000000000000000000000000000000", "address" : "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", "priKey" : "c55c80b0afcbebea36bc2cc1f07a1946935fe578c0c8c35190180f99619d5f48" @@ -1194,7 +1067,7 @@ _**request form data:**_ { "success" : true, "data" : { - "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f000000000000000000000000000000000000000000000000000000000000000000000000006921023cee1aa6158ee640c8f48f9a9fa9735c8ed5426f2c353b0ed65e123033d820e646304402203c376fd0121fce6228516c011126a8526c5bc543afb7e4272c0de708a55d834f02204ebcd942e019b77bbec37f7e2b77b591ba4ce0ae925ded6bed", + "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f000000000000000000000000000000000000000000000000000000000000000000000000006921023cee1aa6158ee640c8f48f9a9fa9735c8ed5426f2c353b0ed65e123033d820e646304402203c376fd0121fce6228516c011126a8526c5bc543afb7e4272c0de708a55d834f02204ebcd942e019b77bbec37f7e2b77b591ba4ce0fbc5fe9335ab91ae925ded6bed", "hash" : "5a91b75e6a6d1f415638375627933b42ce7179b4c6390ca0dcc5a0c2c74bd34a" } } @@ -1219,15 +1092,15 @@ _**详细描述: 密文私钥摘要签名**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | ------------------- | :------: | -| form | -- | 表单 | -- | -|         txHex | string | 交易序列化Hex字符串 | 是 | -|         address | string | 账户地址 | 是 | -|         encryptedPriKey | string | 账户密文私钥 | 是 | -|         password | string | 账户密码 | 是 | -|         chainId | int | 地址链ID | 是 | -|         prefix | string | 地址前缀 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------------- |:-----------------------:| ----------- |:----:| +| form | encryptedprikeysignform | 密文私钥摘要签名表单 | 是 | +|         txHex | string | 交易序列化Hex字符串 | 是 | +|         address | string | 账户地址 | 是 | +|         encryptedPriKey | string | 账户密文私钥 | 是 | +|         password | string | 账户密码 | 是 | +|         chainId | int | 地址链ID | 是 | +|         prefix | string | 地址前缀 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1243,7 +1116,6 @@ _**request form data:**_ ```json { - "chainId":1, "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f0000000000000000000000000000000000000000000000000000000000000000000000000000", "address" : "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", "encryptedPriKey" : "54793157409d0414248ef290eac96270c1a0115d712e845f0eb372bb977cbc0cafe39d598175473fa1bd5329dd1fae95", @@ -1282,16 +1154,15 @@ _**详细描述: 多账号密文私钥摘要签名**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ | :------: | -------------------- | :------: | -| form | -- | 密文私钥摘要签名表单 | -- | -|     chainId | int | 地址链ID | | -|     txHex | string | 交易序列化Hex字符串 | 是 | -|    prefix | string | 地址前缀 | 是 | -| signDtoList | | | | -|           address | string | 账户地址 | 是 | -|            encryptedPriKey | string | 账户密文私钥 | 是 | -|           password | string | 账户密码 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| --------------------------------------------------------------- |:-----------------------:| ----------- |:----:| +| form | encryptedprikeysignform | 密文私钥摘要签名表单 | 是 | +|         txHex | string | 交易序列化Hex字符串 | 是 | +|         address | string | 账户地址 | 是 | +|         encryptedPriKey | string | 账户密文私钥 | 是 | +|         password | string | 账户密码 | 是 | +|         chainId | int | 地址链ID | 是 | +|         prefix | string | 地址前缀 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1301,37 +1172,13 @@ _**详细描述: 多账号密文私钥摘要签名**_ #### Example request data: _**request path:**_ -/api/account/encryptedPriKeys/sign +略 _**request form data:**_ - -``` -{ - "chainId":1, - "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f0000000000000000000000000000000000000000000000000000000000000000000000000000", - "prefix":"tNULS", - "signDtoList":[ - { - "address" : "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", - "encryptedPriKey" : "54793157409d0414248ef290eac96270c1a0115d712e845f0eb372bb977cbc0cafe39d598175473fa1bd5329dd1fae95", - "password" : "abcd1234" - } - ] -} -``` +无 #### Example response data: -``` -{ - "success" : true, - "data" : { - "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f000000000000000000000000000000000000000000000000000000000000000000000000006921023cee1aa6158ee640c8f48f9a9fa9735c8ed5426f2c353b0ed65e123033d820e646304402203c376fd0121fce6228516c011126a8526c5bc543afb7e4272c0de708a55d834f02204ebcd942e019b77bbec37f7e2b77b591ba4ce0fbc5fe9335ab91ae925ded6bed", - "hash" : "5a91b75e6a6d1f415638375627933b42ce7179b4c6390ca0dcc5a0c2c74bd34a" - } -} -``` - - +略 ### 1.20 创建多签账户 #### Cmd: /api/account/multiSign/create @@ -1348,11 +1195,11 @@ _**详细描述: 根据多个账户的公钥创建多签账户，minSigns为多 ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| -------------------------------------------------------- | :-------------: | ---------------- | :------: | -| form | -- | 创建多签账户表单 | 是 | -|         pubKeys | list<string> | 账户公钥集合 | 是 | -|         minSigns | int | 最小签名数 | 是 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| -------------------------------------------------------- |:--------------------------:| -------- |:----:| +| form | multisignaccountcreateform | 创建多签账户表单 | 是 | +|         pubKeys | list<string> | 账户公钥集合 | 是 | +|         minSigns | int | 最小签名数 | 是 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -1569,6 +1416,7 @@ _**详细描述: 根据区块高度查询区块头**_ | preHash | string | 上一个区块的hash值 | | merkleHash | string | 梅克尔hash | | time | string | 区块生成时间 | +| timestamp | long | 区块生成时间戳 | | height | long | 区块高度 | | txCount | int | 区块打包交易数量 | | blockSignature | string | 签名Hex.encode(byte[]) | @@ -1577,6 +1425,7 @@ _**详细描述: 根据区块高度查询区块头**_ | roundIndex | long | 共识轮次 | | consensusMemberCount | int | 参与共识成员数量 | | roundStartTime | string | 当前共识轮开始时间 | +| roundStartTimestamp | long | 当前共识轮开始时间戳 | | packingIndexOfRound | int | 当前轮次打包出块的名次 | | mainVersion | short | 主网当前生效的版本 | | blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1633,6 +1482,7 @@ _**详细描述: 根据区块hash查询区块头**_ | preHash | string | 上一个区块的hash值 | | merkleHash | string | 梅克尔hash | | time | string | 区块生成时间 | +| timestamp | long | 区块生成时间戳 | | height | long | 区块高度 | | txCount | int | 区块打包交易数量 | | blockSignature | string | 签名Hex.encode(byte[]) | @@ -1641,6 +1491,7 @@ _**详细描述: 根据区块hash查询区块头**_ | roundIndex | long | 共识轮次 | | consensusMemberCount | int | 参与共识成员数量 | | roundStartTime | string | 当前共识轮开始时间 | +| roundStartTimestamp | long | 当前共识轮开始时间戳 | | packingIndexOfRound | int | 当前轮次打包出块的名次 | | mainVersion | short | 主网当前生效的版本 | | blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1695,6 +1546,7 @@ _**详细描述: 查询最新区块头信息**_ | preHash | string | 上一个区块的hash值 | | merkleHash | string | 梅克尔hash | | time | string | 区块生成时间 | +| timestamp | long | 区块生成时间戳 | | height | long | 区块高度 | | txCount | int | 区块打包交易数量 | | blockSignature | string | 签名Hex.encode(byte[]) | @@ -1703,6 +1555,7 @@ _**详细描述: 查询最新区块头信息**_ | roundIndex | long | 共识轮次 | | consensusMemberCount | int | 参与共识成员数量 | | roundStartTime | string | 当前共识轮开始时间 | +| roundStartTimestamp | long | 当前共识轮开始时间戳 | | packingIndexOfRound | int | 当前轮次打包出块的名次 | | mainVersion | short | 主网当前生效的版本 | | blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1758,6 +1611,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         preHash | string | 上一个区块的hash值 | |         merkleHash | string | 梅克尔hash | |         time | string | 区块生成时间 | +|         timestamp | long | 区块生成时间戳 | |         height | long | 区块高度 | |         txCount | int | 区块打包交易数量 | |         blockSignature | string | 签名Hex.encode(byte[]) | @@ -1766,6 +1620,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         roundIndex | long | 共识轮次 | |         consensusMemberCount | int | 参与共识成员数量 | |         roundStartTime | string | 当前共识轮开始时间 | +|         roundStartTimestamp | long | 当前共识轮开始时间戳 | |         packingIndexOfRound | int | 当前轮次打包出块的名次 | |         mainVersion | short | 主网当前生效的版本 | |         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -1895,6 +1750,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         preHash | string | 上一个区块的hash值 | |         merkleHash | string | 梅克尔hash | |         time | string | 区块生成时间 | +|         timestamp | long | 区块生成时间戳 | |         height | long | 区块高度 | |         txCount | int | 区块打包交易数量 | |         blockSignature | string | 签名Hex.encode(byte[]) | @@ -1903,6 +1759,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         roundIndex | long | 共识轮次 | |         consensusMemberCount | int | 参与共识成员数量 | |         roundStartTime | string | 当前共识轮开始时间 | +|         roundStartTimestamp | long | 当前共识轮开始时间戳 | |         packingIndexOfRound | int | 当前轮次打包出块的名次 | |         mainVersion | short | 主网当前生效的版本 | |         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -2032,6 +1889,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         preHash | string | 上一个区块的hash值 | |         merkleHash | string | 梅克尔hash | |         time | string | 区块生成时间 | +|         timestamp | long | 区块生成时间戳 | |         height | long | 区块高度 | |         txCount | int | 区块打包交易数量 | |         blockSignature | string | 签名Hex.encode(byte[]) | @@ -2040,6 +1898,7 @@ _**详细描述: 包含区块打包的所有交易信息，此接口返回数据 |         roundIndex | long | 共识轮次 | |         consensusMemberCount | int | 参与共识成员数量 | |         roundStartTime | string | 当前共识轮开始时间 | +|         roundStartTimestamp | long | 当前共识轮开始时间戳 | |         packingIndexOfRound | int | 当前轮次打包出块的名次 | |         mainVersion | short | 主网当前生效的版本 | |         blockVersion | short | 区块的版本，可以理解为本地钱包的版本 | @@ -2483,9 +2342,9 @@ _**request form data:**_ } ``` -### 3.6 单笔转账 -#### Cmd: /api/accountledger/transfer -_**详细描述: 发起单账户单资产的转账交易**_ +### 3.6 跨链转账 +#### Cmd: /api/accountledger/crossTransfer +_**详细描述: 发起单账户单资产的跨链转账交易**_ #### HttpMethod: POST #### Form json data: @@ -2503,16 +2362,16 @@ _**详细描述: 发起单账户单资产的转账交易**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ |:------------:| ------ |:----:| -| 单笔转账 | transferform | 单笔转账表单 | 是 | -|         address | string | 账户地址 | 是 | -|         toAddress | string | 账户地址 | 是 | -|         password | string | 账户密码 | 是 | -|         assetChainId | int | 资产链ID | 否 | -|         assetId | int | 资产ID | 否 | -|         amount | biginteger | 金额 | 是 | -|         remark | string | 备注 | 否 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------ |:-----------------:| --------- |:----:| +| 跨链转账 | crosstransferform | 跨链转账表单 | 是 | +|         address | string | 账户地址 | 是 | +|         toAddress | string | 账户地址 | 是 | +|         password | string | 账户密码 | 是 | +|         assetChainId | int | 资产chainId | 是 | +|         assetId | int | 资产Id | 是 | +|         amount | biginteger | 金额 | 是 | +|         remark | string | 备注 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2521,34 +2380,17 @@ _**详细描述: 发起单账户单资产的转账交易**_ #### Example request data: _**request path:**_ -/api/accountledger/transfer +略 _**request form data:**_ - -```json -{ - "address" : "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", - "toAddress" : "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", - "password" : "nuls123456", - "amount" : 10000000000, - "remark" : "remark" -} -``` +无 #### Example response data: +略 -```json -{ - "success" : true, - "data" : { - "value" : "89368623898cde34fe81b5ede6fe5bed75ffb61021ec6caa01a9a5dcd9262d69" - } -} -``` - -### 3.7 跨链转账 -#### Cmd: /api/accountledger/crossTransfer -_**详细描述: 发起单账户单资产的跨链转账交易**_ +### 3.7 单笔转账 +#### Cmd: /api/accountledger/transfer +_**详细描述: 发起单账户单资产的转账交易**_ #### HttpMethod: POST #### Form json data: @@ -2566,16 +2408,16 @@ _**详细描述: 发起单账户单资产的跨链转账交易**_ ``` #### 参数列表 -| 参数名 | 参数类型 | 参数描述 | 是否必填 | -| ------------------------------------------------------------ |:-----------------:| --------- |:----:| -| 跨链转账 | crosstransferform | 跨链转账表单 | 是 | -|         address | string | 账户地址 | 是 | -|         toAddress | string | 账户地址 | 是 | -|         password | string | 账户密码 | 是 | -|         assetChainId | int | 资产chainId | 是 | -|         assetId | int | 资产Id | 是 | -|         amount | biginteger | 金额 | 是 | -|         remark | string | 备注 | 否 | +| 参数名 | 参数类型 | 参数描述 | 是否必填 | +| ------------------------------------------------------------ |:------------:| ------ |:----:| +| 单笔转账 | transferform | 单笔转账表单 | 是 | +|         address | string | 账户地址 | 是 | +|         toAddress | string | 账户地址 | 是 | +|         password | string | 账户密码 | 是 | +|         assetChainId | int | 资产链ID | 否 | +|         assetId | int | 资产ID | 否 | +|         amount | biginteger | 金额 | 是 | +|         remark | string | 备注 | 否 | #### 返回值 | 字段名 | 字段类型 | 参数描述 | @@ -2584,24 +2426,23 @@ _**详细描述: 发起单账户单资产的跨链转账交易**_ #### Example request data: _**request path:**_ -/api/accountledger/crossTransfer +/api/accountledger/transfer _**request form data:**_ -``` +```json { "address" : "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", - "toAddress" : "TNVTeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", + "toAddress" : "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", "password" : "nuls123456", "amount" : 10000000000, - "assetChainId":2, - "assetId":1, "remark" : "remark" } ``` #### Example response data: -``` + +```json { "success" : true, "data" : { @@ -2610,8 +2451,6 @@ _**request form data:**_ } ``` - - ### 3.8 离线组装转账交易 #### Cmd: /api/accountledger/createTransferTxOffline _**详细描述: 根据inputs和outputs离线组装转账交易，用于单账户或多账户的转账交易。交易手续费为inputs里本链主资产金额总和，减去outputs里本链主资产总和**_ @@ -2758,42 +2597,13 @@ _**详细描述: 根据inputs和outputs离线组装跨链转账交易，用于 #### Example request data: _**request path:**_ -/api/accountledger/createCrossTxOffline +略 _**request form data:**_ - -``` -{ - "inputs" : [ { - "address" : "tNULSeBaMujLBcZWfE2wHKnZo7PGvqvNrt6yWG", - "assetChainId" : 2, - "assetId" : 1, - "amount" : 1100000, - "nonce" : "0000000000000000" - } ], - "outputs" : [ { - "address" : "TNVTeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", - "assetChainId" : 2, - "assetId" : 1, - "amount" : "1000000", - "lockTime" : 0 - } ], - "remark" : null -} -``` +无 #### Example response data: -``` -{ - "success" : true, - "data" : { - "txHex" : "02003fac2d5d00008c0117020001efa328e600912da9872390a675486ab9e8ec211402000100e0c8100000000000000000000000000000000000000000000000000000000000080000000000000000000117020001f7ec6473df12e751d64cf20a8baa7edd50810f810200010040420f0000000000000000000000000000000000000000000000000000000000000000000000000000", - "hash" : "5a91b75e6a6d1f415638375627933b42ce7179b4c6390ca0dcc5a0c2c74bd34a" - } -} -``` - - +略 ### 3.10 计算离线创建转账交易所需手续费 #### Cmd: /api/accountledger/calcTransferTxFee @@ -2888,31 +2698,13 @@ _**详细描述: 计算离线创建跨链转账交易所需手续费**_ #### Example request data: _**request path:**_ -/api/accountledger/calcCrossTxFee +略 _**request form data:**_ - -``` -{ - "addressCount" : 6, - "fromLength" : 6, - "toLength" : 2, - "remark" : "remark", - "price" : "100000" -} -``` +无 #### Example response data: -``` -{ - "success" : true, - "data" : { - "value" : 2000000 - } -} -``` - - +略 ### 3.12 多签账户离线组装转账交易 #### Cmd: /api/accountledger/createMultiSignTransferTxOffline @@ -3120,7 +2912,7 @@ _**request form data:**_ "price" : 25, "password" : "nuls123456", "remark" : "restful-nrc20-remark", - "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a26923f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e6377505aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", + "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", "alias" : "restful_nrc20", "args" : [ "io", "IO", 80000, 1 ] } @@ -3409,7 +3201,8 @@ _**详细描述: 获取账户地址的指定合约的token余额**_ | contractAddress | string | 合约地址 | | name | string | token名称 | | symbol | string | token符号 | -| amount | string | token数量 | +| amount | string | token可用数量 | +| lockAmount | string | token锁定数量 | | decimals | long | token支持的小数位数 | | blockHeight | long | 合约创建时的区块高度 | | status | int | 合约状态(0-不存在, 1-正常, 2-终止) | @@ -3458,6 +3251,7 @@ _**详细描述: 获取智能合约详细信息**_ | createTime | long | 合约创建时间（单位：秒） | | blockHeight | long | 合约创建时的区块高度 | | isDirectPayable | boolean | 是否接受直接转账 | +| directPayableByOtherAsset | boolean | 是否接受其他资产直接转账 | | tokenType | int | token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 | | isNrc20 | boolean | 是否是NRC20合约 | | nrc20TokenName | string | NRC20-token名称 | @@ -3476,6 +3270,7 @@ _**详细描述: 获取智能合约详细信息**_ |         view | boolean | 是否视图方法（调用此方法数据不上链） | |         event | boolean | 是否是事件 | |         payable | boolean | 是否是可接受主链资产转账的方法 | +|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 | |         jsonSerializable | boolean | 方法返回值是否JSON序列化 | #### Example request data: @@ -4008,6 +3803,7 @@ _**详细描述: 获取合约代码构造函数**_ |         view | boolean | 是否视图方法（调用此方法数据不上链） | |         event | boolean | 是否是事件 | |         payable | boolean | 是否是可接受主链资产转账的方法 | +|         payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 | |         jsonSerializable | boolean | 方法返回值是否JSON序列化 | | isNrc20 | boolean | 是否是NRC20合约 | #### Example request data: @@ -4019,7 +3815,7 @@ _**request form data:**_ ```json { - "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ab46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf5d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301084035c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000" + "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000" } ``` @@ -4095,6 +3891,7 @@ _**详细描述: 获取已发布合约指定函数的信息**_ | view | boolean | 是否视图方法（调用此方法数据不上链） | | event | boolean | 是否是事件 | | payable | boolean | 是否是可接受主链资产转账的方法 | +| payableMultyAsset | boolean | 是否是可接受其他资产转账的方法 | | jsonSerializable | boolean | 方法返回值是否JSON序列化 | #### Example request data: @@ -4248,7 +4045,7 @@ _**request form data:**_ "sender" : "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", "gasLimit" : 20000, "price" : 25, - "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e33734a552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c14959666d8f2f52d12542f89d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a039742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", + "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", "args" : [ "io", "IO", 80000, 1 ] } ``` @@ -4433,7 +4230,7 @@ _**request form data:**_ ```json { "sender" : "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", - "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebe9b930eb64e2706114a2639488f97d6152c9b0587a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd9804b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", + "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", "args" : [ "io", "IO", 80000, 1 ] } ``` @@ -4624,7 +4421,7 @@ _**request form data:**_ "alias" : "rf_nrc20_offline", "senderBalance" : "999999998523475", "nonce" : "9c0aea02bed90ddd", - "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd726b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d491872d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", + "contractCode" : "504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b31600000000", "gasLimit" : 20245, "args" : [ "air", "AIR", 10000, 2 ], "argsType" : [ "String", "String", "BigInteger", "int" ], @@ -4638,7 +4435,7 @@ _**request form data:**_ { "success" : true, "data" : { - "txHex" : "0f008629375d0e28292072657475726e20766f6964fd8119020001f7ec6473df12e751d64cf20a8baa7edd50810f810200020d2f73cb93099a8cfd0cbdd060155abfe2f50917fd1a19504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e78b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436c156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c723e2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bff16f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b316000000001072665f6e726332305f6f66666c696e65154f0000000000001900000000000000040103616972010341495201053130303030010132480117020001f7ec6473df12e751d64cf20a8baa7edd50810f81020001006d67120000000000000000000000000000000000000000000000000000000000089c0aea02bed90ddd000000", + "txHex" : "0f008629375d0e28292072657475726e20766f6964fd8119020001f7ec6473df12e751d64cf20a8baa7edd50810f810200020d2f73cb93099a8cfd0cbdd060155abfe2f50917fd1a19504b03040a0000080000aa7b564e00000000000000000000000003000400696f2ffeca0000504b03040a0000080000aa7b564e00000000000000000000000008000000696f2f6e756c732f504b03040a0000080000aa7b564e00000000000000000000000011000000696f2f6e756c732f636f6e74726163742f504b03040a0000080000aa7b564e00000000000000000000000017000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b0304140008080800aa7b564e00000000000000000000000028000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373b558f97754e5197eeecc90990c972d9090059209a498cc9291a58a8152020d35ca5602b1605bbd99b9492ecc12670922b46ead4babd56aeb5ad1565bd4aa2c020169d59ed353cfe93fd17f84d3d3e7fdee9d3b37612639d5d31ff2ddf77ecbfb3eeff67c77f2afff7cf639804df87b23a23825c323329c96e14c1831fcb411cdf859108f86119497281e93e171997e22cce149197e1ec62ff0d462acc2d3413c13c672fc2a8ce7f0bcccfc3a8817827831cc53bf91e125195e96e5df8af4bb205e09a3430e44f19a0cafcbf086a87d5386df87f096cc9c9597b7457a27843fc8f38f21bc2b7ade0be24f41fc39887341bcaf219033b2a686a6bdc78d692399317213c99152c1ca4d6cd3d0503c951dcb673484d266caca1a99a2066d58c3e252be646446ca535399531a5aeca359a33499dc654d0ce74ae68459e0f1d098417d2993a796d97bca252b93dc674c71b171c49ac819a57281c68766af6edf6be593b972a6984ce573a582912a258be913c9c174ba60168bdb6a9bdb419d412393c99f34d31a4a5f43e337342f0056f5f6d58a6360773e6d4a10ac9cb9bf9c1d330b878db18c8a7a3e6564468d8225efce64a0346931643db7c228e54f98b9e488959de26691a9bbed503957b2b2e6a855b4787c3097636e4a563e47151b6a7b62b87b92a39679924afcbd7d4c6b6b05fdada96cd86ee5acd20e0d3b7a6f75b0decc5c35c37da31a968822cbc80c66f304ae61dd6cfc078d02ebb164166639125dd09143e64365ab60a6a5b2541548e16938dcbb4032e75dad1b8e45f99339b3a0a173fef3acc8e294994bcb565d1d19ac14e8a269235336a5796655c0a9a94a152c192919a9132c47f56eb302b5d048ae386e16f614f2590d47be917bb5bdeb3bc6121c57ea7da53cc3e974f181710d772c60af6ec0828e129242c5030d772e84be2ebea0313555c84f53dd722b972a9846d11c543306c92a6ca4d3667ad48eef7232d79cf565c5f29832e66e0ae53315510ebb49fabf84973d1032ec2d1babe2260f2ed77eb868565f96550e559739b3ab12d7af19cc5109a6bdc583c0d5ba283569a64e90657aeb9f4fd659ab7fa24115ffc68a40df63f3eaf0528b9cf7678b131a06ff27bbb5358547f2e542cadc6349cb2df7306bbf6cd7d18fa48edb65d8884d3a36638b8e217ca0e3436cd1b0a27a6fdc6d1427d9ac3abe8d3b74dc25c35f64f347f858c727381fc4051d177149c7a7b84c42abc3edca76cf61a74586a64da1c82573def5e11ca96477c62816cda2e0213d5cd17115333aaee13a0fccbacf782dd58a888e49983a72c8e83821c367b8a1c382b910ba4a2755d0cd7ad79116adf7e05e1d79301e7fc5df747c8ef31a3a8673c5f2f8b895b2b82fe274703aa254cbe6691d5fe0bc8ea36087270e4f9a11551d916cb9588a8c999109f6312f864869d2c845f2850819dfc8f078e4f67e394e289db32c389413c98fdb36fac5c52f79e32c7cafb216aae57260ecb899a2f6b535fb6bb7f3a261cd7c5153772c0b2e706ce8d001be1c1edacf712a7f527a6bb82e6f86b2e54cc9529f59fdf55ab0ded9d69a78f749eb34149d5b29c22b7f812bcc3f55a6735bbdf7be1d916db7cef4dd3aa5a1bda68123ac4e524ec0cc5a54df5587bd544dd93d3f6172df861a306a1a0d16ec0f025ae83d26e71b53f9ec9451607ee761337e04f9c9868c7b85097943f71eabc51de8e637750c3ec49140039a842af8e3a049d8423d49187cfa8433d493c400d2b492b7f2ef2ecffb003fd699616ca3bc9d3349be697c2e8a5e8676416df90ec70635b9163b38eaf6067c173bf91c745677f1a911422d45beb98ad62fa8682376d750e4ff688ea2be05156dc6f76a280acc45945c50d110f6388afecd1d8bf834a3335476090d571088de40f0e80c4257d05815c3d1d81568d1f815f8a2cd812bf0471397b0b8397015fa552c915397d1780d4b05d0752cf3e3be1b587e54736666b0e21a9a2eba40fbb158fd060c30658bb11a2d6865296cc606a639c6246f645a0799d6434c729a491687b6d8401d8744ea57711049cac5a7a4ef739f5f491b95febb29b705b86d58797eeb4892e50189c51754212692441c8e5dc74a1fbec4aafd89af1064602e24e2ce54f340a02df015429c1449c21f505e75f2f72a887529313611650bc3bd8ec9bf8d798b33e4552f92ae1749ecc53e276dfb29f978ba1b07e8bf9f6797e0204f04f00327a1f6da56ae1de2cc52f86ea22588919b680ee2f0ac248bdf4b7c737c3d825127ef670823c0674f34c6142566d0128d715c1d8d736c95d4c54492ac05aa85daa2c0df8b46825e46b0cd84bc8e80c4b1a8adcf75ac07f7398ef5e087ca31910eaaf408b895fe9ae9e0bde5a4e3491e914cf6c4fe8960e01c02fe6b68932aaba4a6795fdc4ecdbeb8e4c0ef817884d11a453b2174d2f83aea1488115b9f07a21dfb7684713f81f9545417c31fdaa9dd446bad90063517e98ff0632798166d8ae6ae2863199728c6e24e143921f29c3836a9583d80101e64120d92d1980760970bb04b454e53d24105b0665a7fe22279d041d21e750cb7df404705c49ad92096aa9d134ce624bbcff200687701b4ab9ad494340f80075c00136c0151d15d01b0b602404d5c45671d1c59e2c8d1cdbc0747b78ba3dbc5d14d1febe2305c1c978943623c142586ae8aedfdf1c45544ce62859a60e53040e7a057b0b6cc83d5efe9f022a35c22ee32ab6d9a55f4302faf47d8e7a73d8d30e4621f72b10f31cd5b5487df89946a04a9b746e9e21e165ba896533ef914a42c4e3de1907584f545740381685b40bc4bc8108bb705e85d375daaf2acdd0d8fb2d01ea3d5c7b1923abad85955268ab83823187770469846bb61234ec3865821f72826f2c907af83e78c83a7d38327d1b46e06eb2b687a66a1b1cbfe296a7b1a2bf00ccbfe590f924e1749a78ba4d345d2e922697191582e927f7045740cd8b1f0f2b74dd66dce453610508b6dce1dd51688276c49507a59fc39ea7b5efe958836bc40067991fcfc126fa2973d88075cc4032ee20117f1808378156fb5e3e4f32a8bdb335b3923f90f816493248bf3147f42381e9de6aa448ba1bc8a6fed8fc69b36cce0b68a7b8db10423de5d85ee4df72b64ac577975bcc680bf4ee86f78ca72bd0b793d5b6e9ff30563b776031372bf82ec931f340e90a203a4cb01928837f54a862b207ae682b0b3fc16d59d65cdbdcd78bee301e025b7ec1c726b60ac2b00f8b3c701708c6f12cfd5bc075648d3b285dfacde0817dde60cab6def320aef29832df631d7e06a654653415f045fd34e4dd979c8b133e5dc371dd19804597843cabab62ddbc973d4f33eed7e407afcd0435c1daecd0e14944d918aee1543eb2d8ef59263dd74acb7d6f0327e0d7d73ddfc98ee7ce231d9ea9a6c75dc14a9acbe8be6383ced96984f79b1a68ec38959666d8f2f52d12542f894fe5cf6a4758d6b7e8debf11ac7639104887fb6ef2755c53c8c5f2ae53e2c278b3e4b36ece0f35534fe17504b0708ec308779cb09000028180000504b0304140008080800aa7b564e00000000000000000000000022000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373a552d14e1341143d03b5cb16aa28a8a0284a08697970131ff481a76a24694282a19507dfa6bb431d989da933b325fc9a0f7e801f65bc534ba5b6a5896eb23b3be79e7bcebd33f7c7cf6fdf01bcc64e84e711b623bc60a8367a3d6bfa5c7de80bed19569a5a0bfb5e71e7848bf092186dcbb53b1376c828699e0b86f55afde89cf779a2b8ee262d6fa5ee1e306c9e14dacb5c9c4a273b4a34b4369e7b69b463d83b9226d18572496ab4b73cf589cb2e123ee224a7525c9248d95de51da318963291ca9c2b4a5eacd59b0ccb9ea8aa55f47aea8a61e3ba869cfb2fc93bd96d6a2fbac29244dce154582a8ecf18ded4a61b37b2cc0ae70e668aec8c37f3915b6add0b3bd6d5fedcae4ec4d7425a9191e2921f1e26c3db39554d2faafe99eee85ae4d09a9ce1d33ca17fb489f86034e8ae63ae94b90cc7c9d0fe2fb799475d6999c2a6e2502af2a8b4cd85d0af0295616b42d0876832e030acfe19c2e3ceb9486942f76fcbd8fd6be06f278fcd7e99816101e1894b749788695fa15d99d66580b0952958157727b07b589dc0eee301a9dfc0b0466f144cd70784877844ff01ac2efc0647a1c7d81886d6166f864684cdd9b94ff0748aef388d085b83ef33dca135141a7c4ad46e488a10ff02504b070868fe421cca0100005e040000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c6173738d565b6f1b4514fec6bbde75b69bbb49d224b46929e05b6a2ee19a4b73218140d2943835b4406163af926d9cdd74771d90a0129540ea033c801020242e2f252f790089b80824c45390f82ffc03049c995dbb89e3243cf8ccd93367e67cdf7c6746fef39f5f7e03f018ae6988e34213148c7333c1cd248f4da998d63083e735bcc0cd0c66b937abe2450d2770218697f838c7cd7c0c176358e0ee256e5e56b1a822c71075deb64d97e1d49ce564ed72c9cb161cdb778d829ff58a6bd98962d1353d6f9841f5364cbbc853a39b46a96c3274cd5d37368decbae1af6627ad9559db37574c97529511cbb6fc3186cb89a3773d66b6e1f6c93c833ce5140940eb9c659b17cbebcba6bb642c9728d231e7148c52de702dfe1d06657fd5f2189a2736365c87b04f6f9ab6cfa0cfdac47caa64789e49d39983607c67cdb4b34bdc9edbb798389e5d2cdbbeb56ee62dcfa22a970cd758377dd39db06dc7377ccbb169cf546382462d27bb68de285bae59a41d632ba6bf10883190481e2747ccab659f39e694f98969b479ae2aa0e6edf9e065f381a03d54f6104979b930eb64e2706114a2639488f97d6152c9b057b20bcbd7cd823f9cbccac01c2ed28129219241a234e77ca3b0366f6c08eda8c1a9f4aae1ad06824b89e42c152156e5122533fa88f94ece772d7b85215e852f760ea2b4b39673ca6ec19cb1782f6842cdf33c4d471f967474a15b470f3727d1abe332f22a5e21e9fe7f37a87855c7237854c5151d4fe16986ee7a189365ab244e3bbe6fe5bbe2f28deab88ad7b8799d006606c28b364ae43203e2ae898c37740c6384a1adfef4187a1bea1ff6391d5a3e9059f43a43e7be7312413aa6fea308379aded362c4ab514b9054c60627c330983828cd41b5c2631aaecbaff6cf11f9fd89a9c3a771869ecc38a82b2121c215a78735c2451723e94ea346f37de8a7effbe9ab44a34c633c75172c95de412495d981941adc81fca358758a6c17a2646f50a68b267868818f4e94719aa2a9603d06f000203c5e97098f578e088fd796708efc4e89261f2467bf7d080f93e590b234f2e5d1d44f88fc50c3a088e03ba2a61e248435191248868bc7289b575404977b0c34117d8fd6dc143b74055935d44a889a2e444320523d90f71b0249370622d503f980d67c7808909e104806830d80c8f5406e3704725e2c3a0044ae07f211adf9f810205c335e98ae7cb8d75f9423d1782b95fe1e51793bbd8b965405d134fdee202a6da77f8732cf75dba58ea22143bf0ad4afd0ba45375ec4298b9f679020514cda9b205513e45db4f381627205b12db472ef0fa8f21664699b404882462f01053e818a4fe9e43e23989f13e52ff026be14b40602c0355ab7e89fc6e3824e1143148be009d1a0badac2fe46bf8a2715d6adb0b836cea9d32b1752ff393cc6e9805d734a306be26046da4ef7ad069c78580ac36f55e37210271a5a10efbb07bf43dc9eafe9367d43cdf32da6f0dd1e35a643d89d04fa193c4b5038d84128ede3ec5fbae511824b30c947e84718cbefffa445f49c862caed1b6bc51867ec5892b77a1773457484141a5b5a32df025eeb7073e616e6dbb594147059df58d77674fe30d8540231815760c67c3a746c173f42c35fd07504b0708ea7bbc798f040000e6090000504b0304140008080800aa7b564e00000000000000000000000030000000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c6173738d56df531b5514fe6e76b31bb60be19740015b5aab8624b06ad156c36f84160da5051a0bd5da25d9c296b08bbb1b5e1c1ffa6ff8aebcf0a033923a3ae3f88433fe2ffe078e7aeedd854212c0879c7bf6dc73eef9cef9cebd933ffff9e53700efe189864e4c3441c12417535c4c73db8c8a590d73b8a3e12e177398e7dabc8a4f345cc244029ff235cfc54202f71258e4ea7d2e1ea85852b1cc203ff3dc6d862b79db359c4ad9378aae1378663130fcd29631552a7996efe7186281cb10df35cb158ba12bffdcdc358d6d33d834a6ed8d7927b0362c8fbc9451dbb183718687a9f30fbc60b7e1f18305823be3960840326f3bd6bdcaf6bae5ad98eb65b2b4e7dda2592e989ecdbf23a31c6cda3e43f38a673afe33cb9bddb59c80419f771ccb9b299bbe6fd176b61e4ce06e598eb1c2e58d53c154e3f5a58a13d8db56c1f66dca72dff4cc6d2bb0bc29c7710333b05d87ce4c372ed03cf63196acaf2ab66795e84475c30ae6040d03a9c18b8850fd23e76b17f498f72b4e47af70e6fc704dd0772124b187729d4163c23ff6ba9c3a9b0c854a30cb54ed6b9153d974368cc5f5e75631c80dae3130971353b72588318988e6e5c02c6e2d983b822f1a674abd69fa9b21c9526a709e92502d95323933fa4804ee72e0d9ce0643e7117c717268a593b565b7e215ad399bf3af090687b99b8e3eace8e842b78e1e2e2ea357c74314547c4674fdff0950f148c73b7857c5aa8e5bb8cdd05d0b63ba62974b96c7d0712af26b7ed5c674ace131179f132bd981c01da3b2b203e26689cd2f74e430cad05adb3786de867c47534ded2a84048bc9a6eca73a248cd4a0fef34a6db47d62a4a8eb8d8681483277762ca7c43094aa27a59ea7a841b91affa3c939c7bf3f3573f636aed1d3d8099a47488871aee9018d71bac54a8cd3aad17e1ffae9fb75fa2ad32ad3da997e0996ce1c2096ce1e404a0f1d40fe51445d21d98538c92c790ea109c36881810e1a82ab644d87f118c01b80d0785e26349e3926349e5bc20dd293120986374fc8b7f036490ec7a09587c6d33f21f6c3717e45186f8a7c7ae810e5634861300a1e276f9e4d1175bc42af09eb2d8ab92d4ee80abd8e112b1162ba060d8148b540720d81641a03916a814c50cce419407a2220596a743d10b916c84c4320c322a80e885c0be40ec5dc3d0308e78b27a68b1e9df517f970ea5ea433df232eef670ed192ae229ea1df77884bfb99dfa12c70de0e699a68c9d2af0af55b24f7a065859dbc783f4307896cd24907e9c8413e441b5fc8265791d843926b7f4095f7204bfb04421265f41250200f150bd4b94582f9804a5ec2975816650d84808fcb7a41ff266e8a724a18215b0cef8be1d4d516f637fa557ca0b06e85756a93bc747adba2d27f8eda381b56d79c1695357130a3ad57fb36c39ab8598acc4f8fec7268a732b4d0def70a7ebbb8398fe826add2f0ac119b8f4fb0311bc1ee20d01fe22382c2c10e41699b64ffd20d8f115c82493a223dc658e1f42705d1531a55f1848ee58332f22b2eadbe84dede5c25064529c9f6d65097b8de16ea8439d9fa4d15ed5574d40eded313833712018d614cc8715c8f9e19051fd393d4f41f504b0708826261e37e040000ca090000504b01020a000a0000080000aa7b564e000000000000000000000000030004000000000000000000000000000000696f2ffeca0000504b01020a000a0000080000aa7b564e000000000000000000000000080000000000000000000000000025000000696f2f6e756c732f504b01020a000a0000080000aa7b564e00000000000000000000000011000000000000000000000000004b000000696f2f6e756c732f636f6e74726163742f504b01020a000a0000080000aa7b564e00000000000000000000000017000000000000000000000000007a000000696f2f6e756c732f636f6e74726163742f746f6b656e2f504b01021400140008080800aa7b564eec308779cb090000281800002800000000000000000000000000af000000696f2f6e756c732f636f6e74726163742f746f6b656e2f53696d706c65546f6b656e2e636c617373504b01021400140008080800aa7b564e68fe421cca0100005e0400002200000000000000000000000000d00a0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e2e636c617373504b01021400140008080800aa7b564eea7bbc798f040000e60900003000000000000000000000000000ea0c0000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e24417070726f76616c4576656e742e636c617373504b01021400140008080800aa7b564e826261e37e040000ca0900003000000000000000000000000000d7110000696f2f6e756c732f636f6e74726163742f746f6b656e2f546f6b656e245472616e736665724576656e742e636c617373504b0506000000000800080051020000b316000000001072665f6e726332305f6f66666c696e65154f0000000000001900000000000000040103616972010341495201053130303030010132480117020001f7ec6473df12e751d64cf20a8baa7edd50810f81020001006d67120000000000000000000000000000000000000000000000000000000000089c0aea02bed90ddd000000", "contractAddress" : "tNULSeBaMwYiR4p1X9xNJPiyJfrXjr4KgkcFjG", "hash" : "9443656bab59f52441286e1d859855be28cbe155973c712c07385a21b7212152" } diff --git a/module/nuls-api/pom.xml b/module/nuls-api/pom.xml index afca37df71..7ebae20a72 100644 --- a/module/nuls-api/pom.xml +++ b/module/nuls-api/pom.xml @@ -42,6 +42,14 @@ io.nuls.v2 nuls-base-api-provider + + io.nuls.v2 + nuls-core-h2 + + + org.mybatis + mybatis + diff --git a/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java b/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java index 7f84e88476..3f383e552c 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java @@ -8,6 +8,7 @@ import io.nuls.core.core.config.ConfigurationLoader; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.exception.NulsException; +import io.nuls.core.log.Log; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.I18nUtils; import io.nuls.core.rpc.info.HostInfo; @@ -18,6 +19,9 @@ import io.nuls.core.rpc.modulebootstrap.RpcModuleState; import io.nuls.core.rpc.util.AddressPrefixDatas; import io.nuls.provider.api.RpcServerManager; +import io.nuls.provider.api.cache.LedgerAssetCache; +import io.nuls.provider.api.config.Config; +import io.nuls.provider.api.config.Context; import io.nuls.v2.NulsSDKBootStrap; import java.util.Map; @@ -38,6 +42,10 @@ public class ApiBootstrap extends RpcModule { MyModule myModule; @Autowired private AddressPrefixDatas addressPrefixDatas; + @Autowired + private LedgerAssetCache ledgerAssetCache; + @Autowired + private Config config; public static void main(String[] args) { boolean isOffline = false; @@ -70,7 +78,9 @@ public static void main(String[] args) { SpringLiteContext.init(basePackage); } initRpcServer(configItemMap); - + if (null != configItemMap && configItemMap.get("accessLimit") != null) { + Context.accessLimit = Boolean.parseBoolean(configItemMap.get("accessLimit").getValue()); + } NulsSDKBootStrap.init(defaultChainId, ""); try { I18nUtils.setLanguage("en"); @@ -120,6 +130,16 @@ public boolean doStart() { return true; } + @Override + public void onDependenciesReady(Module module) { + Log.info("dependencies [{}] ready", module.getName()); + if (ModuleE.LG.abbr.equals(module.getName())) { + Log.info("onDependenciesReady ledger"); + ledgerAssetCache.initial(config.getChainId()); + } + + } + @Override public RpcModuleState onDependenciesReady() { return myModule.startModule(moduleName); @@ -129,5 +149,4 @@ public RpcModuleState onDependenciesReady() { public RpcModuleState onDependenciesLoss(Module dependenciesModule) { return RpcModuleState.Running; } - } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/cache/LedgerAssetCache.java b/module/nuls-api/src/main/java/io/nuls/provider/api/cache/LedgerAssetCache.java new file mode 100644 index 0000000000..9270f4ff70 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/cache/LedgerAssetCache.java @@ -0,0 +1,79 @@ +package io.nuls.provider.api.cache; + + +import io.nuls.base.api.provider.Result; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.provider.api.config.Config; +import io.nuls.provider.api.model.AssetInfo; +import io.nuls.provider.rpctools.CrossChainTools; +import io.nuls.provider.rpctools.LegderTools; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author: PierreLuo + * @date: 2021/5/31 + */ +@Component +public class LedgerAssetCache { + + @Autowired + private LegderTools legderTools; + @Autowired + private CrossChainTools crossChainTools; + @Autowired + private Config config; + private long lastCrossAssetQueryRecordTime;// 最近一次跨链资产查询时间 + private long minitus_2 = 60 * 2 * 1000l;// 两分钟 + private Map CACHE_MAP = new HashMap<>(); + + public void initial(int chainId) { + Result allAsset = legderTools.getAllAsset(chainId); + List list = allAsset.getList(); + for (Map map : list) { + int assetChainId = Integer.parseInt(map.get("assetChainId").toString()); + int assetId = Integer.parseInt(map.get("assetId").toString()); + int decimalPlace = Integer.parseInt(map.get("decimalPlace").toString()); + String symbol = map.get("assetSymbol").toString(); + String key = assetChainId + "_" + assetId; + CACHE_MAP.put(key, new AssetInfo(assetChainId, assetId, symbol, decimalPlace)); + } + lastCrossAssetQueryRecordTime = System.currentTimeMillis(); + } + + public AssetInfo getAssetInfo(int chainId, int assetId) { + String key = chainId + "_" + assetId; + AssetInfo dto = CACHE_MAP.get(key); + if (dto == null) { + if (chainId == config.getChainId()) { + Result result = legderTools.getAsset(chainId, assetId); + if (result.isSuccess()) { + dto = result.getData(); + } + } else { + long now = System.currentTimeMillis(); + if (now - lastCrossAssetQueryRecordTime > minitus_2) { + List crossAssetInfos = crossChainTools.getRegisteredChainInfoList(config.getChainId()); + if (crossAssetInfos != null) { + for (AssetInfo assetInfo : crossAssetInfos) { + String _key = assetInfo.getChainId() + "_" + assetInfo.getAssetId(); + CACHE_MAP.put(_key, assetInfo); + } + dto = CACHE_MAP.get(key); + lastCrossAssetQueryRecordTime = now; + } + } + } + if (dto == null) { + return null; + } + CACHE_MAP.put(key, dto); + } + return dto; + } + +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/config/Context.java b/module/nuls-api/src/main/java/io/nuls/provider/api/config/Context.java index 6fe407f1b8..00ce51d91e 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/config/Context.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/config/Context.java @@ -27,6 +27,7 @@ import io.nuls.provider.api.model.AssetInfo; import io.nuls.provider.api.model.ChainInfo; +import java.util.ArrayList; import java.util.List; /** @@ -43,7 +44,10 @@ public class Context { public static List assetList; + public static List blackAddressList = new ArrayList<>(); + public static ChainInfo defaultChain; + public static boolean accessLimit; @@ -57,4 +61,5 @@ public static Integer getChainId() { public static boolean isChainExist(int chainId) { return getChainId() == chainId; } + } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java b/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java index 2773a60520..6ee8950cf0 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java @@ -80,4 +80,5 @@ public interface CommandConstant { String TOKEN_BALANCE = "sc_token_balance"; //查询已注册的跨链信息 String GET_REGISTERED_CHAIN = "getRegisteredChainInfoList"; + String CODE_HASH = "sc_code_hash"; } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/AccountController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/AccountController.java index 3344bb000f..6bf8898625 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/AccountController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/AccountController.java @@ -39,8 +39,8 @@ import io.nuls.core.rpc.model.*; import io.nuls.provider.api.config.Config; import io.nuls.provider.api.config.Context; +import io.nuls.provider.model.dto.AccountBlockDTO; import io.nuls.provider.model.dto.AccountKeyStoreDto; -import io.nuls.provider.model.dto.ContractTokenInfoDto; import io.nuls.provider.model.form.PriKeyForm; import io.nuls.provider.model.jsonrpc.RpcResult; import io.nuls.provider.model.jsonrpc.RpcResultError; @@ -48,6 +48,7 @@ import io.nuls.provider.rpctools.ContractTools; import io.nuls.provider.rpctools.LegderTools; import io.nuls.provider.rpctools.vo.AccountBalance; +import io.nuls.provider.rpctools.vo.AccountBalanceWithDecimals; import io.nuls.provider.utils.Log; import io.nuls.provider.utils.ResultUtil; import io.nuls.provider.utils.Utils; @@ -67,8 +68,8 @@ import java.io.IOException; import java.math.BigInteger; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -181,7 +182,7 @@ public RpcResult updatePassword(List params) { if (!FormatValidUtils.validPassword(newPassword)) { return RpcResult.paramError("[newPassword] is inValid"); } - if (System.currentTimeMillis() - time < 3000L) { + if (Context.accessLimit && System.currentTimeMillis() - time < 3000L) { return RpcResult.paramError("Access frequency limit."); } time = System.currentTimeMillis(); @@ -232,7 +233,7 @@ public RpcResult getPriKey(List params) { return RpcResult.paramError("[password] is inValid"); } - if (System.currentTimeMillis() - time < 3000L) { + if (Context.accessLimit && System.currentTimeMillis() - time < 3000L) { return RpcResult.paramError("Access frequency limit."); } time = System.currentTimeMillis(); @@ -380,7 +381,7 @@ public RpcResult exportKeystore(List params) { return RpcResult.paramError("[password] is inValid"); } - if (System.currentTimeMillis() - time < 3000L) { + if (Context.accessLimit && System.currentTimeMillis() - time < 3000L) { return RpcResult.paramError("Access frequency limit."); } time = System.currentTimeMillis(); @@ -447,6 +448,59 @@ public RpcResult getAccountBalance(List params) { if (balanceResult.isFailed()) { return rpcResult.setError(new RpcResultError(balanceResult.getStatus(), balanceResult.getMessage(), null)); } + AccountBalance resultData = balanceResult.getData(); + if (resultData != null) { + return rpcResult.setResult(resultData); + } else { + return rpcResult.setResult(null); + } + } + + @RpcMethod("getAccountBalanceWithDecimals") + @ApiOperation(description = "查询账户余额", order = 107, detailDesc = "根据资产链ID和资产ID，查询本链账户对应资产的余额与nonce值") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), + @Parameter(parameterName = "assetChainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "资产的链ID"), + @Parameter(parameterName = "assetId", requestType = @TypeDescriptor(value = int.class), parameterDes = "资产ID"), + @Parameter(parameterName = "address", requestType = @TypeDescriptor(value = String.class), parameterDes = "账户地址") + }) + @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = AccountBalanceWithDecimals.class)) + public RpcResult getAccountBalanceWithDecimals(List params) { + VerifyUtils.verifyParams(params, 4); + int chainId, assetChainId, assetId; + String address; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + try { + assetChainId = (int) params.get(1); + } catch (Exception e) { + return RpcResult.paramError("[assetChainId] is inValid"); + } + try { + assetId = (int) params.get(2); + } catch (Exception e) { + return RpcResult.paramError("[assetId] is inValid"); + } + try { + address = (String) params.get(3); + } catch (Exception e) { + return RpcResult.paramError("[address] is inValid"); + } + if (!AddressTool.validAddress(chainId, address)) { + return RpcResult.paramError("[address] is inValid"); + } + + if (!Context.isChainExist(chainId)) { + return RpcResult.dataNotFound(); + } + RpcResult rpcResult = new RpcResult(); + Result balanceResult = legderTools.getBalanceAndNonceWithDecimals(chainId, assetChainId, assetId, address); + if (balanceResult.isFailed()) { + return rpcResult.setError(new RpcResultError(balanceResult.getStatus(), balanceResult.getMessage(), null)); + } return rpcResult.setResult(balanceResult.getData()); } @@ -494,6 +548,52 @@ public RpcResult getBalanceList(List params) { if (balanceResult.isFailed()) { return rpcResult.setError(new RpcResultError(balanceResult.getStatus(), balanceResult.getMessage(), null)); } + List list = balanceResult.getData(); + if (list != null && !list.isEmpty()) { + return rpcResult.setResult(list); + } else { + return rpcResult.setResult(Collections.emptyList()); + } + } + + @RpcMethod("getBalanceWithDecimalsList") + @ApiOperation(description = "查询账户余额", order = 107, detailDesc = "根据资产链ID和资产ID，查询本链账户对应资产的余额与nonce值集合") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), + @Parameter(parameterName = "address", requestType = @TypeDescriptor(value = String.class), parameterDes = "账户地址"), + @Parameter(parameterName = "assetIdList", requestType = @TypeDescriptor(value = List.class), parameterDes = "资产的ID集合") + }) + @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = AccountBalance.class)) + public RpcResult getBalanceWithDecimalsList(List params) { + VerifyUtils.verifyParams(params, 3); + String address; + int chainId; + List coinDtoList; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + try { + address = (String) params.get(1); + } catch (Exception e) { + return RpcResult.paramError("[address] is inValid"); + } + try { + coinDtoList = (List ) params.get(2); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + + if (!AddressTool.validAddress(chainId, address)) { + return RpcResult.paramError("[address] is inValid"); + } + RpcResult rpcResult = new RpcResult(); + + Result> balanceResult = legderTools.getBalanceWithDecimalsList(chainId, coinDtoList, address); + if (balanceResult.isFailed()) { + return rpcResult.setError(new RpcResultError(balanceResult.getStatus(), balanceResult.getMessage(), null)); + } return rpcResult.setResult(balanceResult.getData()); } @@ -840,6 +940,94 @@ public RpcResult sign(List params) { return ResultUtil.getJsonRpcResult(result); } + @RpcMethod("isBlockAccount") + @ApiOperation(description = "是否锁定账户", order = 165) + @Parameters({ + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), + @Parameter(parameterName = "address", parameterType = "String", parameterDes = "账户地址"), + }) + @ResponseData(name = "返回值", description = "返回一个Map对象", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "value", description = "是否锁定"), + })) + public RpcResult isBlockAccount(List params) { + int chainId; + String address; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + try { + address = (String) params.get(1); + } catch (Exception e) { + return RpcResult.paramError("[address] is inValid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + if (!AddressTool.validAddress(chainId, address)) { + return RpcResult.paramError("[address] is inValid"); + } + boolean blockAccount = accountTools.isBlockAccount(chainId, address); + return RpcResult.success(Map.of("value", blockAccount)); + } + + @RpcMethod("getBlockAccountInfo") + @ApiOperation(description = "查询锁定账户信息", order = 166) + @Parameters({ + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), + @Parameter(parameterName = "address", parameterType = "String", parameterDes = "账户地址"), + }) + @ResponseData(name = "返回值", description = "返回一个Map对象", responseType = @TypeDescriptor(value = AccountBlockDTO.class)) + public RpcResult getBlockAccountInfo(List params) { + int chainId; + String address; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + try { + address = (String) params.get(1); + } catch (Exception e) { + return RpcResult.paramError("[address] is inValid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + if (!AddressTool.validAddress(chainId, address)) { + return RpcResult.paramError("[address] is inValid"); + } + AccountBlockDTO dto = accountTools.getBlockAccountInfo(chainId, address); + if (dto == null) { + return RpcResult.failed(AccountErrorCode.DATA_NOT_FOUND); + } + return RpcResult.success(dto); + } + + @RpcMethod("getAllContractCallAccount") + @ApiOperation(description = "查询调用合约允许普通转账的账户白名单", order = 167) + @Parameters({ + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID") + }) + @ResponseData(name = "返回值", description = "返回一个Map对象", responseType = @TypeDescriptor(value = AccountBlockDTO.class)) + public RpcResult getAllContractCallAccount(List params) { + int chainId; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + Map map = accountTools.getAllContractCallAccount(chainId); + if (map == null) { + return RpcResult.failed(AccountErrorCode.DATA_NOT_FOUND); + } + return RpcResult.success(map); + } + @RpcMethod("encryptedPriKeySign") @ApiOperation(description = "密文私钥摘要签名", order = 156) @Parameters({ diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ConsensusController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ConsensusController.java index 3b057818e0..c7a9027495 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ConsensusController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ConsensusController.java @@ -25,6 +25,7 @@ import io.nuls.base.api.provider.consensus.ConsensusProvider; import io.nuls.base.api.provider.consensus.facade.*; import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.CoinData; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Controller; import io.nuls.core.core.annotation.RpcMethod; @@ -179,6 +180,34 @@ public RpcResult stopAgent(List params) { return rpcResult; } + @RpcMethod("stopAgentCoinData") + @ApiOperation(description = "获取注销共识节点的coindata", order = 502) + @Parameters({ + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), + @Parameter(parameterName = "agentHash", parameterDes = "节点hash", requestType = @TypeDescriptor(value = String.class)) + }) + @ResponseData(name = "返回值", description = "返回一个CoinData", responseType = @TypeDescriptor(value = String.class)) + public RpcResult getStopAgentCoinData(List params) { + int chainId; + String agentHash; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + try { + agentHash = (String) params.get(1); + } catch (Exception e) { + return RpcResult.paramError("[agentHash] is inValid"); + } + + GetStopAgentCoinDataReq req = new GetStopAgentCoinDataReq(agentHash,1L); + req.setChainId(chainId); + Result result = consensusProvider.getStopAgentCoinData(req); + RpcResult rpcResult = ResultUtil.getJsonRpcResult(result); + return rpcResult; + } + @RpcMethod("depositToAgent") @ApiOperation(description = "委托参与共识", order = 503) @Parameters({ diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java index 8cccc1a4a3..7b0d1d4b98 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java @@ -938,6 +938,30 @@ public RpcResult invokeView(List params) { return ResultUtil.getJsonRpcResult(mapResult); } + @RpcMethod("codeHash") + @ApiOperation(description = "获取合约的codeHash", order = 419) + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "contractAddress", parameterDes = "合约地址") + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的codeHash") + })) + public RpcResult codeHash(List params) { + VerifyUtils.verifyParams(params, 2); + int chainId; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is invalid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + Result mapResult = contractTools.codeHash(chainId, params.get(1)); + return ResultUtil.getJsonRpcResult(mapResult); + } + @RpcMethod("contractCreateOffline") @ApiOperation(description = "离线 - 发布合约交易", order = 450) diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/LegerController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/LegerController.java index eae61e9a78..acb446787f 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/LegerController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/LegerController.java @@ -1,16 +1,20 @@ package io.nuls.provider.api.jsonrpc.controller; import io.nuls.base.api.provider.Result; +import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Controller; import io.nuls.core.core.annotation.RpcMethod; +import io.nuls.provider.api.model.AssetInfo; import io.nuls.provider.model.jsonrpc.RpcResult; import io.nuls.provider.model.jsonrpc.RpcResultError; +import io.nuls.provider.rpctools.CrossChainTools; import io.nuls.provider.rpctools.LegderTools; import io.nuls.v2.model.annotation.Api; import io.nuls.v2.model.annotation.ApiType; import java.util.List; +import java.util.Map; @Controller @Api(type = ApiType.JSONRPC) @@ -19,6 +23,8 @@ public class LegerController { @Autowired private LegderTools legderTools; + @Autowired + private CrossChainTools crossChainTools; @RpcMethod("getAllAsset") public RpcResult getAllAsset(List params) { @@ -29,11 +35,28 @@ public RpcResult getAllAsset(List params) { return RpcResult.paramError("[chainId] is inValid"); } - Result result = legderTools.getAllAsset(chainId); + Result result = legderTools.getAllAsset(chainId); RpcResult rpcResult = new RpcResult(); if (result.isFailed()) { return rpcResult.setError(new RpcResultError(result.getStatus(), result.getMessage(), null)); } return rpcResult.setResult(result.getList()); } + + @RpcMethod("getAllCrossAsset") + public RpcResult getAllCrossAsset(List params) { + int chainId; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is inValid"); + } + + List assetInfos = crossChainTools.getRegisteredChainInfoList(chainId); + RpcResult rpcResult = new RpcResult(); + if (assetInfos == null) { + return rpcResult.setError(new RpcResultError(CommonCodeConstanst.DATA_NOT_FOUND.getCode(), null, null)); + } + return rpcResult.setResult(assetInfos); + } } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java index 616125761f..dff3182932 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java @@ -28,6 +28,9 @@ import io.nuls.base.api.provider.block.facade.GetBlockHeaderByHeightReq; import io.nuls.base.api.provider.crosschain.CrossChainProvider; import io.nuls.base.api.provider.crosschain.facade.CreateCrossTxReq; +import io.nuls.base.data.CoinData; +import io.nuls.base.data.CoinFrom; +import io.nuls.core.crypto.HexUtil; import io.nuls.provider.api.config.Config; import io.nuls.provider.api.config.Context; import io.nuls.base.RPCUtil; @@ -52,10 +55,7 @@ import io.nuls.provider.model.jsonrpc.RpcResult; import io.nuls.provider.rpctools.ContractTools; import io.nuls.provider.rpctools.TransactionTools; -import io.nuls.provider.utils.Log; -import io.nuls.provider.utils.ResultUtil; -import io.nuls.provider.utils.Utils; -import io.nuls.provider.utils.VerifyUtils; +import io.nuls.provider.utils.*; import io.nuls.v2.model.annotation.Api; import io.nuls.v2.model.annotation.ApiOperation; import io.nuls.v2.model.annotation.ApiType; @@ -235,7 +235,7 @@ public RpcResult broadcastTx(List params) { if (argsResult.getError() != null) { return argsResult; } - String[][] multyAssetValues = Utils.extractMultyAssetInfoFromCallTransaction(callTx.getCoinDataInstance(), config.getChainId(), config.getAssetsId()); + String[][] multyAssetValues = Utils.extractMultyAssetInfoFromCallTransaction(call.getContractAddress(), callTx.getCoinDataInstance(), config.getChainId(), config.getAssetsId()); result = contractTools.validateContractCall(chainId, AddressTool.getStringAddressByBytes(call.getSender()), call.getValue(), @@ -973,4 +973,5 @@ public RpcResult calcMultiSignTransferTxFee(List params) { return RpcResult.success(map); } + } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountLedgerResource.java b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountLedgerResource.java index 14176f4d26..a517122703 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountLedgerResource.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountLedgerResource.java @@ -23,12 +23,11 @@ */ package io.nuls.provider.api.resources; -import io.nuls.base.api.provider.crosschain.CrossChainProvider; -import io.nuls.base.api.provider.crosschain.facade.CreateCrossTxReq; -import io.nuls.provider.api.config.Config; import io.nuls.base.RPCUtil; import io.nuls.base.api.provider.Result; import io.nuls.base.api.provider.ServiceManager; +import io.nuls.base.api.provider.crosschain.CrossChainProvider; +import io.nuls.base.api.provider.crosschain.facade.CreateCrossTxReq; import io.nuls.base.api.provider.ledger.LedgerProvider; import io.nuls.base.api.provider.transaction.TransferService; import io.nuls.base.api.provider.transaction.facade.TransferReq; @@ -41,9 +40,11 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.model.StringUtils; import io.nuls.core.rpc.model.*; +import io.nuls.provider.api.config.Config; import io.nuls.provider.model.ErrorData; import io.nuls.provider.model.RpcClientResult; import io.nuls.provider.model.dto.AccountBalanceDto; +import io.nuls.provider.model.dto.AccountBalanceWithDecimalsDto; import io.nuls.provider.model.form.BalanceForm; import io.nuls.provider.model.form.CrossTransferForm; import io.nuls.provider.model.form.TransferForm; @@ -52,6 +53,7 @@ import io.nuls.provider.rpctools.LegderTools; import io.nuls.provider.rpctools.TransactionTools; import io.nuls.provider.rpctools.vo.AccountBalance; +import io.nuls.provider.rpctools.vo.AccountBalanceWithDecimals; import io.nuls.provider.utils.Log; import io.nuls.provider.utils.ResultUtil; import io.nuls.provider.utils.Utils; @@ -126,6 +128,32 @@ public RpcClientResult getBalance(@PathParam("address") String address, BalanceF return clientResult; } + @POST + @Path("/balanceWithDecimals/{address}") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "查询账户余额", order = 109, detailDesc = "根据资产链ID和资产ID，查询本链账户对应资产的余额与nonce值") + @Parameters({ + @Parameter(parameterName = "balanceDto", parameterDes = "账户余额表单", requestType = @TypeDescriptor(value = BalanceForm.class)) + }) + @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = AccountBalanceWithDecimalsDto.class)) + public RpcClientResult getBalanceWithDecimals(@PathParam("address") String address, BalanceForm form) { + if (!AddressTool.validAddress(config.getChainId(), address)) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "address is invalid")); + } + if (form.getAssetChainId() < 1 || form.getAssetChainId() > 65535) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "assetChainId is invalid")); + } + if (form.getAssetId() < 1 || form.getAssetId() > 65535) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "assetId is invalid")); + } + Result balanceResult = legderTools.getBalanceAndNonceWithDecimals(config.getChainId(), form.getAssetChainId(), form.getAssetId(), address); + RpcClientResult clientResult = ResultUtil.getRpcClientResult(balanceResult); + if (clientResult.isSuccess()) { + clientResult.setData(new AccountBalanceWithDecimalsDto((AccountBalanceWithDecimals) clientResult.getData())); + } + return clientResult; + } + @POST @Path("/transaction/validate") @Produces(MediaType.APPLICATION_JSON) @@ -189,7 +217,7 @@ public RpcClientResult broadcast(TxForm form) { if (argsResult.isFailed()) { return argsResult; } - String[][] multyAssetValues = Utils.extractMultyAssetInfoFromCallTransaction(callTx.getCoinDataInstance(), config.getChainId(), config.getAssetsId()); + String[][] multyAssetValues = Utils.extractMultyAssetInfoFromCallTransaction(call.getContractAddress(), callTx.getCoinDataInstance(), config.getChainId(), config.getAssetsId()); result = contractTools.validateContractCall(config.getChainId(), AddressTool.getStringAddressByBytes(call.getSender()), call.getValue(), diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountResource.java b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountResource.java index e644583589..fc48e1eabc 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountResource.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/AccountResource.java @@ -38,6 +38,7 @@ import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.model.*; +import io.nuls.provider.api.config.Context; import io.nuls.provider.model.ErrorData; import io.nuls.provider.model.RpcClientResult; import io.nuls.provider.model.dto.AccountKeyStoreDto; @@ -140,7 +141,7 @@ public RpcClientResult updatePassword(@PathParam("address") String address, Acco if (!FormatValidUtils.validPassword(form.getNewPassword())) { return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "[newPassword] is invalid")); } - if (System.currentTimeMillis() - time < 3000L) { + if (Context.accessLimit && System.currentTimeMillis() - time < 3000L) { return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "Access frequency limit.")); } time = System.currentTimeMillis(); @@ -172,7 +173,7 @@ public RpcClientResult getPriKey(@PathParam("address") String address, AccountPa if (address == null) { return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "address is empty")); } - if (System.currentTimeMillis() - time < 3000L) { + if (Context.accessLimit && System.currentTimeMillis() - time < 3000L) { return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "Access frequency limit.")); } time = System.currentTimeMillis(); diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ConsensusResource.java b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ConsensusResource.java index 9b38683e51..fcfee6f07f 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ConsensusResource.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ConsensusResource.java @@ -131,6 +131,29 @@ public RpcClientResult stopAgent(StopAgentForm form) { return clientResult; } + @POST + @Path("/agent/stopCoinData") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "注销共识节点的coinData", order = 502) + @Parameters({ + @Parameter(parameterName = "StopAgentForm", parameterDes = "注销共识节点表单", requestType = @TypeDescriptor(value = StopAgentForm.class)) + }) + @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = String.class)) + public RpcClientResult getStopAgentCoinData(GetStopAgentCoinDataForm form) { + if (form == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "form is empty")); + } + GetStopAgentCoinDataReq req = new GetStopAgentCoinDataReq( + form.getAgentHash(), 1L); + req.setChainId(config.getChainId()); + Result result = consensusProvider.getStopAgentCoinData(req); + RpcClientResult clientResult = ResultUtil.getRpcClientResult(result); + if (clientResult.isSuccess()) { + return clientResult.resultMap().map("value", clientResult.getData()).mapToData(); + } + return clientResult; + } + @POST @Path("/deposit") @Produces(MediaType.APPLICATION_JSON) diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java index e7ed6e54e9..16e4051dd1 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java @@ -584,6 +584,25 @@ public RpcClientResult invokeView(ContractViewCall form) { return ResultUtil.getRpcClientResult(mapResult); } + @POST + @Path("/codeHash") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "获取合约的codeHash", order = 419) + @Parameters(value = { + @Parameter(parameterName = "获取合约的codeHash", parameterDes = "获取合约的codeHash", requestType = @TypeDescriptor(value = ContractCodeHash.class)) + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的codeHash") + })) + public RpcClientResult codeHash(ContractCodeHash form) { + if (form == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "form data is empty")); + } + Result mapResult = contractTools.codeHash(config.getChainId(), + form.getContractAddress()); + return ResultUtil.getRpcClientResult(mapResult); + } + @POST @Path("/create/offline") diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBalanceWithDecimalsDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBalanceWithDecimalsDto.java new file mode 100644 index 0000000000..40e0fa428b --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBalanceWithDecimalsDto.java @@ -0,0 +1,109 @@ +package io.nuls.provider.model.dto; + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; +import io.nuls.provider.rpctools.vo.AccountBalanceWithDecimals; + +/** + * @author: PierreLuo + * @date: 2019-06-30 + */ +@ApiModel +public class AccountBalanceWithDecimalsDto { + + @ApiModelProperty(description = "总余额") + private String total; + @ApiModelProperty(description = "锁定金额") + private String freeze; + @ApiModelProperty(description = "可用余额") + private String available; + @ApiModelProperty(description = "时间锁定金额") + private String timeLock; + @ApiModelProperty(description = " 共识锁定金额") + private String consensusLock; + @ApiModelProperty(description = "账户资产nonce值") + private String nonce; + @ApiModelProperty(description = "1：已确认的nonce值,0：未确认的nonce值") + private int nonceType; + @ApiModelProperty(description = "资产精度") + private int decimals; + + public AccountBalanceWithDecimalsDto() { + + } + + public AccountBalanceWithDecimalsDto(AccountBalanceWithDecimals info) { + this.total = info.getTotalBalance(); + this.freeze = info.getFreeze(); + this.available = info.getBalance(); + this.timeLock = info.getTimeLock(); + this.consensusLock = info.getConsensusLock(); + this.nonce = info.getNonce(); + this.nonceType = info.getNonceType(); + this.decimals = info.getDecimals(); + } + + public int getDecimals() { + return decimals; + } + + public void setDecimals(int decimals) { + this.decimals = decimals; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public String getFreeze() { + return freeze; + } + + public void setFreeze(String freeze) { + this.freeze = freeze; + } + + public String getAvailable() { + return available; + } + + public void setAvailable(String available) { + this.available = available; + } + + public String getTimeLock() { + return timeLock; + } + + public void setTimeLock(String timeLock) { + this.timeLock = timeLock; + } + + public String getConsensusLock() { + return consensusLock; + } + + public void setConsensusLock(String consensusLock) { + this.consensusLock = consensusLock; + } + + public String getNonce() { + return nonce; + } + + public void setNonce(String nonce) { + this.nonce = nonce; + } + + public int getNonceType() { + return nonceType; + } + + public void setNonceType(int nonceType) { + this.nonceType = nonceType; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBlockDTO.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBlockDTO.java new file mode 100644 index 0000000000..7d2df8ac8b --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/AccountBlockDTO.java @@ -0,0 +1,61 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.provider.model.dto; + +import java.util.List; + +/** + * @author: PierreLuo + * @date: 2022/1/25 + */ +public class AccountBlockDTO { + + private String address; + private List types; + private List contracts; + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public List getTypes() { + return types; + } + + public void setTypes(List types) { + this.types = types; + } + + public List getContracts() { + return contracts; + } + + public void setContracts(List contracts) { + this.contracts = contracts; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractInternalCreateDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractInternalCreateDto.java new file mode 100644 index 0000000000..a0e13c4a19 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractInternalCreateDto.java @@ -0,0 +1,75 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.provider.model.dto; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; + +/** + * @author: PierreLuo + */ +@ApiModel +public class ContractInternalCreateDto { + @ApiModelProperty(description = "交易创建者地址") + private String sender; + @ApiModelProperty(description = "创建的合约地址") + private String contractAddress; + @ApiModelProperty(description = "内部创建所依据的合约") + private String codeCopyBy; + @ApiModelProperty(description = "参数列表") + private String args; + + public String getSender() { + return sender; + } + + public void setSender(String sender) { + this.sender = sender; + } + + public String getContractAddress() { + return contractAddress; + } + + public void setContractAddress(String contractAddress) { + this.contractAddress = contractAddress; + } + + public String getCodeCopyBy() { + return codeCopyBy; + } + + public void setCodeCopyBy(String codeCopyBy) { + this.codeCopyBy = codeCopyBy; + } + + public String getArgs() { + return args; + } + + public void setArgs(String args) { + this.args = args; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractResultDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractResultDto.java index 4adc28f112..70c871df3f 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractResultDto.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractResultDto.java @@ -80,6 +80,8 @@ public class ContractResultDto { private List contractTxList; @ApiModelProperty(description = "备注") private String remark; + @ApiModelProperty(description = "内部创建的合约列表", type = @TypeDescriptor(value = List.class, collectionElement = ContractInternalCreateDto.class)) + private List internalCreates; public List getMultyAssetTransfers() { return multyAssetTransfers; @@ -256,4 +258,12 @@ public String getRemark() { public void setRemark(String remark) { this.remark = remark; } + + public List getInternalCreates() { + return internalCreates; + } + + public void setInternalCreates(List internalCreates) { + this.internalCreates = internalCreates; + } } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTokenInfoDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTokenInfoDto.java index 5b8442ac9e..06f8397b5f 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTokenInfoDto.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTokenInfoDto.java @@ -40,8 +40,10 @@ public class ContractTokenInfoDto { private String name; @ApiModelProperty(description = "token符号") private String symbol; - @ApiModelProperty(description = "token数量") + @ApiModelProperty(description = "token可用数量") private String amount; + @ApiModelProperty(description = "token锁定数量") + private String lockAmount; @ApiModelProperty(description = "token支持的小数位数") private long decimals; @ApiModelProperty(description = "合约创建时的区块高度") @@ -81,6 +83,14 @@ public void setAmount(String amount) { this.amount = amount; } + public String getLockAmount() { + return lockAmount; + } + + public void setLockAmount(String lockAmount) { + this.lockAmount = lockAmount; + } + public long getDecimals() { return decimals; } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/block/BlockHeaderDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/block/BlockHeaderDto.java index 8b96a73f60..6ee0492588 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/block/BlockHeaderDto.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/block/BlockHeaderDto.java @@ -55,7 +55,7 @@ public class BlockHeaderDto { @ApiModelProperty(description = "区块生成时间") private String time; - + @ApiModelProperty(description = "区块生成时间戳") private long timestamp; @ApiModelProperty(description = "区块高度") @@ -81,7 +81,7 @@ public class BlockHeaderDto { @ApiModelProperty(description = "当前共识轮开始时间") private String roundStartTime; - + @ApiModelProperty(description = "当前共识轮开始时间戳") private long roundStartTimestamp; @ApiModelProperty(description = "当前轮次打包出块的名次") diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/form/AccountCreateForm.java b/module/nuls-api/src/main/java/io/nuls/provider/model/form/AccountCreateForm.java index 3d953be90c..f766d54cdb 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/model/form/AccountCreateForm.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/form/AccountCreateForm.java @@ -34,7 +34,7 @@ */ @ApiModel(name = "创建账户表单数据") public class AccountCreateForm{ - + @ApiModelProperty(description = "链ID") private int chainId; @ApiModelProperty(description = "新建账户数量") diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/form/consensus/GetStopAgentCoinDataForm.java b/module/nuls-api/src/main/java/io/nuls/provider/model/form/consensus/GetStopAgentCoinDataForm.java new file mode 100644 index 0000000000..200706d0da --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/form/consensus/GetStopAgentCoinDataForm.java @@ -0,0 +1,50 @@ +/* + * + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.provider.model.form.consensus; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; +import io.nuls.provider.model.form.Base; + +/** + * @author Niels + */ +@ApiModel(description = "获取停止节点表单数据") +public class GetStopAgentCoinDataForm extends Base { + + @ApiModelProperty(description = "共识节点hash", required = true) + private String agentHash; + + public String getAgentHash() { + return agentHash; + } + + public void setAgentHash(String agentHash) { + this.agentHash = agentHash; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractCodeHash.java b/module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractCodeHash.java new file mode 100644 index 0000000000..7a394ddbba --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractCodeHash.java @@ -0,0 +1,49 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.provider.model.form.contract; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; +import io.nuls.provider.model.form.Base; + +/** + * @author: PierreLuo + * @date: 2022/6/17 + */ +@ApiModel(description = "获取合约的codeHash表单数据") +public class ContractCodeHash extends Base { + + @ApiModelProperty(description = "合约地址", required = true) + private String contractAddress; + + public String getContractAddress() { + return contractAddress; + } + + public void setContractAddress(String contractAddress) { + this.contractAddress = contractAddress; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/jsonrpc/RpcResult.java b/module/nuls-api/src/main/java/io/nuls/provider/model/jsonrpc/RpcResult.java index 3a833eed60..74ca268c7d 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/model/jsonrpc/RpcResult.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/jsonrpc/RpcResult.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import io.nuls.core.basic.Result; import io.nuls.core.constant.ErrorCode; +import io.nuls.core.model.StringUtils; /** * @author Niels @@ -103,6 +104,9 @@ public static RpcResult failed(Result result) { public static RpcResult failed(ErrorCode errorCode) { RpcResult rpcResult = new RpcResult(); RpcResultError error = new RpcResultError(errorCode.getCode(), errorCode.getMsg(), null); + if(StringUtils.isBlank(error.getMessage())){ + error.setMessage(error.getData().toString()); + } rpcResult.setError(error); return rpcResult; } @@ -110,7 +114,11 @@ public static RpcResult failed(ErrorCode errorCode) { public static RpcResult failed(ErrorCode errorCode, String data) { RpcResult rpcResult = new RpcResult(); RpcResultError error = new RpcResultError(errorCode.getCode(), errorCode.getMsg(), data); + if(StringUtils.isBlank(error.getMessage())){ + error.setMessage(data); + } rpcResult.setError(error); + return rpcResult; } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/AccountTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/AccountTools.java index 8dbe8056a1..4e64393b18 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/AccountTools.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/AccountTools.java @@ -7,10 +7,13 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; +import io.nuls.core.log.Log; +import io.nuls.core.model.StringUtils; import io.nuls.core.parse.MapUtils; import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; +import io.nuls.provider.model.dto.AccountBlockDTO; import io.nuls.provider.rpctools.vo.Account; import io.nuls.v2.error.AccountErrorCode; import io.nuls.v2.util.AccountTool; @@ -83,6 +86,76 @@ private T getAddressInfo(int chainId, String address, String password,String } + public boolean isBlockAccount(int chainId, String address) { + try { + if (StringUtils.isBlank(address)) { + return false; + } + Map params = new HashMap<>(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("address", address); + boolean isBlock = callRpc(ModuleE.AC.abbr, "ac_isBlockAccount", params, (Function, Boolean>) res -> { + if (res == null) { + return false; + } + return (boolean) res.get("value"); + + }); + return isBlock; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + public AccountBlockDTO getBlockAccountInfo(int chainId, String address) { + try { + if (StringUtils.isBlank(address)) { + return null; + } + Map params = new HashMap<>(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("address", address); + AccountBlockDTO dto = callRpc(ModuleE.AC.abbr, "ac_getBlockAccountInfo", params, (Function, AccountBlockDTO>) res -> { + if (res == null) { + return null; + } + AccountBlockDTO result = new AccountBlockDTO(); + result.setAddress((String) res.get("address")); + Object obj0 = res.get("types"); + if (obj0 != null) { + result.setTypes((List) obj0); + } + Object obj1 = res.get("contracts"); + if (obj1 != null) { + result.setContracts((List) obj1); + } + return result; + }); + return dto; + } catch (Exception e) { + io.nuls.provider.utils.Log.error(e); + return null; + } + } + + public Map getAllContractCallAccount(int chainId) { + try { + Map params = new HashMap<>(4); + params.put(Constants.CHAIN_ID, chainId); + Map result = callRpc(ModuleE.AC.abbr, "ac_getAllContractCallAccount", params, (Function, Map>) res -> { + if (res == null) { + return null; + } + return res; + }); + return result; + } catch (Exception e) { + io.nuls.provider.utils.Log.error(e); + return null; + } + } + public MultiSigAccount createMultiSigAccount(int chainId, List pubKeys, int minSigns) throws NulsException { //验证公钥是否重复 Set pubkeySet = new HashSet<>(pubKeys); diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java index e17fc5bf96..bdcd26ce7b 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java @@ -259,4 +259,20 @@ public Result invokeView(int chainId, Object contractAddress, Object method } } + public Result codeHash(int chainId, Object contractAddress) { + Map params = new HashMap<>(); + params.put(Constants.CHAIN_ID, chainId); + params.put("contractAddress", contractAddress); + try { + return callRpc(ModuleE.SC.abbr, CODE_HASH, params,(Function, Result>) res->{ + if(res == null){ + return null; + } + return new Result(res); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/CrossChainTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/CrossChainTools.java new file mode 100644 index 0000000000..35e2505967 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/CrossChainTools.java @@ -0,0 +1,52 @@ +package io.nuls.provider.rpctools; + +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsRuntimeException; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.provider.api.model.AssetInfo; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * 查询跨链模块数据 + * + * @author: PierreLuo + * @date: 2022/3/10 + */ +@Component +public class CrossChainTools implements CallRpc { + + + public List getRegisteredChainInfoList(int chainId) { + try { + return callRpc(ModuleE.CC.abbr, "getRegisteredChainInfoList", new HashMap(), (Function, List>) map -> { + if (map == null) { + return null; + } + List> resultList = (List>) map.get("list"); + List assetList = new ArrayList<>(); + for (Map resultMap : resultList) { + int id = (Integer) resultMap.get("chainId"); + if (id != chainId) { + List> list = (List>) resultMap.get("assetInfoList"); + if (list != null) { + for (Map assetMap : list) { + String symbol = assetMap.get("symbol").toString(); + int decimals = Integer.parseInt(assetMap.get("decimalPlaces").toString()); + int assetId = Integer.parseInt(assetMap.get("assetId").toString()); + assetList.add(new AssetInfo(id, assetId, symbol, decimals)); + } + } + } + } + return assetList; + }); + } catch (NulsRuntimeException e) { + return null; + } + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java index 8cf627fe23..ed9d4f7e4f 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/LegderTools.java @@ -1,14 +1,18 @@ package io.nuls.provider.rpctools; import io.nuls.base.api.provider.Result; +import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.model.StringUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; +import io.nuls.provider.api.cache.LedgerAssetCache; +import io.nuls.provider.api.model.AssetInfo; import io.nuls.provider.model.dto.ContractTokenInfoDto; import io.nuls.provider.rpctools.vo.AccountBalance; +import io.nuls.provider.rpctools.vo.AccountBalanceWithDecimals; import java.math.BigInteger; import java.util.ArrayList; @@ -27,6 +31,8 @@ public class LegderTools implements CallRpc { @Autowired private ContractTools contractTools; + @Autowired + private LedgerAssetCache ledgerAssetCache; /** * 获取可用余额和nonce @@ -60,12 +66,44 @@ public Result getBalanceAndNonce(int chainId, int assetChainId, } } + public Result getBalanceAndNonceWithDecimals(int chainId, int assetChainId, int assetId, String address) { + Map params = new HashMap(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("assetChainId", assetChainId); + params.put("address", address); + params.put("assetId", assetId); + try { + return callRpc(ModuleE.LG.abbr, "getBalanceNonce", params, (Function, Result>) map -> { + if (map == null) { + return null; + } + AccountBalanceWithDecimals balanceInfo = new AccountBalanceWithDecimals(); + balanceInfo.setBalance(map.get("available").toString()); + balanceInfo.setTimeLock(map.get("timeHeightLocked").toString()); + balanceInfo.setConsensusLock(map.get("permanentLocked").toString()); + balanceInfo.setFreeze(map.get("freeze").toString()); + balanceInfo.setNonce((String) map.get("nonce")); + balanceInfo.setTotalBalance(new BigInteger(balanceInfo.getBalance()) + .add(new BigInteger(balanceInfo.getConsensusLock())) + .add(new BigInteger(balanceInfo.getTimeLock())).toString()); + balanceInfo.setNonceType((Integer) map.get("nonceType")); + AssetInfo assetInfo = ledgerAssetCache.getAssetInfo(assetChainId, assetId); + if (assetInfo != null) { + balanceInfo.setDecimals(assetInfo.getDecimals()); + } + return new Result<>(balanceInfo); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + - public Result getAllAsset(int chainId) { + public Result getAllAsset(int chainId) { Map params = new HashMap(2); params.put(Constants.CHAIN_ID, chainId); try { - return callRpc(ModuleE.LG.abbr, "lg_get_all_asset", params, (Function, Result>) map -> { + return callRpc(ModuleE.LG.abbr, "lg_get_all_asset", params, (Function, Result>) map -> { if (map == null) { return null; } @@ -77,6 +115,68 @@ public Result getAllAsset(int chainId) { } } + public Result getAsset(int assetChainId, int assetId) { + Map params = new HashMap(2); + params.put(Constants.CHAIN_ID, assetChainId); + params.put("assetId", assetId); + try { + return callRpc(ModuleE.LG.abbr, "getAssetRegInfoByAssetId", params, (Function, Result>) map -> { + if (map == null || map.get("assetSymbol") == null) { + return Result.fail(CommonCodeConstanst.DATA_NOT_FOUND.getCode(), null); + } + int decimalPlace = Integer.parseInt(map.get("decimalPlace").toString()); + String symbol = map.get("assetSymbol").toString(); + return new Result<>(new AssetInfo(assetChainId, assetId, symbol, decimalPlace)); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + + public Result> getBalanceWithDecimalsList(int chainId, List coinDtoList, String address) { + try { + List accountBalanceList = new ArrayList<>(); + for (int i = 0; i < coinDtoList.size(); i++) { + Map map = coinDtoList.get(i); + int assetChainId = (int) map.get("chainId"); + int assetId = (int) map.get("assetId"); + String contractAddress = (String) map.get("contractAddress"); + if (StringUtils.isBlank(contractAddress)) { + AccountBalanceWithDecimals accountBalance = getBalanceAndNonceWithDecimals(chainId, assetChainId, assetId, address).getData(); + accountBalance.setAssetChainId(assetChainId); + accountBalance.setAssetId(assetId); + accountBalance.setContractAddress(contractAddress); + accountBalanceList.add(accountBalance); + } else { + ContractTokenInfoDto dto = contractTools.getTokenBalance(chainId, contractAddress, address).getData(); + AccountBalanceWithDecimals accountBalance = new AccountBalanceWithDecimals(); + accountBalance.setAssetChainId(assetChainId); + accountBalance.setAssetId(assetId); + accountBalance.setContractAddress(contractAddress); + accountBalance.setDecimals((int) dto.getDecimals()); + if (dto == null) { + accountBalance.setBalance("0"); + accountBalance.setTotalBalance("0"); + accountBalance.setConsensusLock("0"); + } else { + accountBalance.setBalance(dto.getAmount()); + accountBalance.setConsensusLock(dto.getLockAmount()); + BigInteger balance = new BigInteger(dto.getAmount()); + BigInteger lockBalance = new BigInteger(dto.getLockAmount()); + accountBalance.setTotalBalance(balance.add(lockBalance).toString()); + } + accountBalance.setTimeLock("0"); + accountBalance.setFreeze("0"); + accountBalanceList.add(accountBalance); + } + } + return new Result>(accountBalanceList); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + + } + public Result> getBalanceList(int chainId, List coinDtoList, String address) { try { List accountBalanceList = new ArrayList<>(); @@ -100,13 +200,15 @@ public Result> getBalanceList(int chainId, List coinDt if (dto == null) { accountBalance.setBalance("0"); accountBalance.setTotalBalance("0"); + accountBalance.setConsensusLock("0"); } else { accountBalance.setBalance(dto.getAmount()); - accountBalance.setTotalBalance(dto.getAmount()); + accountBalance.setConsensusLock(dto.getLockAmount()); + BigInteger balance = new BigInteger(dto.getAmount()); + BigInteger lockBalance = new BigInteger(dto.getLockAmount()); + accountBalance.setTotalBalance(balance.add(lockBalance).toString()); } - accountBalance.setTimeLock("0"); - accountBalance.setConsensusLock("0"); accountBalance.setFreeze("0"); accountBalanceList.add(accountBalance); } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalance.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalance.java index 32adf4f4b2..c1f0a257ed 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalance.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalance.java @@ -10,13 +10,12 @@ */ @ApiModel public class AccountBalance { - + @ApiModelProperty(description = "资产链ID") private int assetChainId; - + @ApiModelProperty(description = "资产ID") private int assetId; - + @ApiModelProperty(description = "合约地址") private String contractAddress; - @ApiModelProperty(description = "总余额") private String totalBalance; @ApiModelProperty(description = "可用余额") diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalanceWithDecimals.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalanceWithDecimals.java new file mode 100644 index 0000000000..eaea0796ce --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/vo/AccountBalanceWithDecimals.java @@ -0,0 +1,137 @@ +package io.nuls.provider.rpctools.vo; + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; + +/** + * @author: PierreLuo + * @date: 2022/3/11 + */ +@ApiModel +public class AccountBalanceWithDecimals { + @ApiModelProperty(description = "资产链ID") + private int assetChainId; + @ApiModelProperty(description = "资产ID") + private int assetId; + @ApiModelProperty(description = "合约地址") + private String contractAddress; + @ApiModelProperty(description = "总余额") + private String totalBalance; + @ApiModelProperty(description = "可用余额") + private String balance; + @ApiModelProperty(description = "时间锁定金额") + private String timeLock; + @ApiModelProperty(description = " 共识锁定金额") + private String consensusLock; + @ApiModelProperty(description = "总锁定余额") + private String freeze; + @ApiModelProperty(description = "账户资产nonce值") + private String nonce; + @ApiModelProperty(description = "1：已确认的nonce值,0：未确认的nonce值") + private int nonceType; + @ApiModelProperty(description = "资产精度") + private int decimals; + + public AccountBalance toAccountBalance() { + AccountBalance accountBalance = new AccountBalance(); + accountBalance.setAssetChainId(assetChainId); + accountBalance.setAssetId(assetId); + accountBalance.setContractAddress(contractAddress); + accountBalance.setTotalBalance(totalBalance); + accountBalance.setBalance(balance); + accountBalance.setTimeLock(timeLock); + accountBalance.setConsensusLock(consensusLock); + accountBalance.setFreeze(freeze); + accountBalance.setNonce(nonce); + accountBalance.setNonceType(nonceType); + return accountBalance; + } + + public int getDecimals() { + return decimals; + } + + public void setDecimals(int decimals) { + this.decimals = decimals; + } + + public String getTotalBalance() { + return totalBalance; + } + + public void setTotalBalance(String totalBalance) { + this.totalBalance = totalBalance; + } + + public String getBalance() { + return balance; + } + + public void setBalance(String balance) { + this.balance = balance; + } + + public String getTimeLock() { + return timeLock; + } + + public void setTimeLock(String timeLock) { + this.timeLock = timeLock; + } + + public String getConsensusLock() { + return consensusLock; + } + + public void setConsensusLock(String consensusLock) { + this.consensusLock = consensusLock; + } + + public String getFreeze() { + return freeze; + } + + public void setFreeze(String freeze) { + this.freeze = freeze; + } + + public String getNonce() { + return nonce; + } + + public void setNonce(String nonce) { + this.nonce = nonce; + } + + public int getNonceType() { + return nonceType; + } + + public void setNonceType(int nonceType) { + this.nonceType = nonceType; + } + + public int getAssetChainId() { + return assetChainId; + } + + public void setAssetChainId(int assetChainId) { + this.assetChainId = assetChainId; + } + + public int getAssetId() { + return assetId; + } + + public void setAssetId(int assetId) { + this.assetId = assetId; + } + + public String getContractAddress() { + return contractAddress; + } + + public void setContractAddress(String contractAddress) { + this.contractAddress = contractAddress; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/utils/ApiDocTool.java b/module/nuls-api/src/main/java/io/nuls/provider/utils/ApiDocTool.java index 87fe7c5f55..fc9868b931 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/utils/ApiDocTool.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/utils/ApiDocTool.java @@ -556,8 +556,12 @@ public static List mapToResultDes(TypeDescriptor typeDescriptor) { } public static List classToResultDes(Class clzs) { + if (clzs == Void.class) { + return null; + } Annotation annotation = clzs.getAnnotation(ApiModel.class); if (annotation == null) { + System.err.println(clzs.getName()); throw new IllegalArgumentException("返回值是复杂对象时必须声明ApiModule注解 + " + clzs.getSimpleName()); } List list = new LinkedList(); @@ -1194,17 +1198,17 @@ private static class Url { private List path; public Url() { - this.protocol = "http"; + this.protocol = "https"; this.host = new ArrayList<>(); - this.host.add("localhost"); - this.port = "18004"; + this.host.add("api.nuls.io"); + this.port = null; this.path = new ArrayList<>(); } public static Url jsonrpcInstance() { Url url = new Url(); url.path.add("jsonrpc"); - url.raw = "http://localhost:18004/jsonrpc"; + url.raw = "https://api.nuls.io/jsonrpc"; return url; } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/utils/BlackListUtils.java b/module/nuls-api/src/main/java/io/nuls/provider/utils/BlackListUtils.java new file mode 100644 index 0000000000..2011619dc3 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/utils/BlackListUtils.java @@ -0,0 +1,58 @@ +//package io.nuls.provider.utils; +// +//import io.nuls.core.basic.InitializingBean; +//import io.nuls.core.core.annotation.Autowired; +//import io.nuls.core.core.annotation.Component; +//import io.nuls.core.exception.NulsException; +//import io.nuls.core.model.StringUtils; +//import io.nuls.provider.api.config.Config; +// +//import java.io.*; +//import java.util.Set; +// +///** +// * @author zhoulijun +// * @description TODO +// * @date 2022/1/18 16:57 +// * @COPYRIGHT www.xianma360.com +// */ +//@Component +//public class BlackListUtils implements InitializingBean { +// +// public Set blackList; +// +// @Autowired +// Config config; +// +// /** +// * 是否不在黑名单中 +// * @param address +// * @return 黑名单中存在返回false +// */ +// public boolean isPass(String address){ +// return !blackList.contains(address); +// } +// +// @Override +// public void afterPropertiesSet() throws NulsException { +// if(StringUtils.isBlank(config.getBlackListPath())){ +// Log.error("未配置黑名单地址"); +// System.exit(0); +// } +// try { +// FileReader reader = new FileReader(new File(config.getBlackListPath())); +// BufferedReader buff = new BufferedReader(reader); +// String line = buff.readLine(); +// while(line != null){ +// blackList.add(line); +// } +// buff.close(); +// Log.info("初始化黑名单完成，共记录{}个黑名单地址", blackList.size()); +// } catch (FileNotFoundException e) { +// Log.error("黑名单地址错误，文件不存在"); +// System.exit(0); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +//} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/utils/Utils.java b/module/nuls-api/src/main/java/io/nuls/provider/utils/Utils.java index 0e97305751..34469f81a9 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/utils/Utils.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/utils/Utils.java @@ -124,7 +124,7 @@ private static int getDepth(Class cls, int depth) { return max; } - public static String[][] extractMultyAssetInfoFromCallTransaction(CoinData coinData, int mainChainId, int mainAssetId) { + public static String[][] extractMultyAssetInfoFromCallTransaction(byte[] contractAddress, CoinData coinData, int mainChainId, int mainAssetId) { List toList = coinData.getTo(); if (toList == null || toList.isEmpty()) { return null; @@ -134,6 +134,9 @@ public static String[][] extractMultyAssetInfoFromCallTransaction(CoinData coinD if (to.getAssetsChainId() == mainChainId && to.getAssetsId() == mainAssetId) { continue; } + if (!Arrays.equals(contractAddress, to.getAddress())) { + continue; + } if (list == null) { list = new ArrayList<>(); } diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/CompleteHandler.java b/module/nuls-block/src/main/java/io/nuls/block/message/handler/CompleteHandler.java index d87b9ec3cf..2d481267ab 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/message/handler/CompleteHandler.java +++ b/module/nuls-block/src/main/java/io/nuls/block/message/handler/CompleteHandler.java @@ -55,7 +55,7 @@ public void process(int chainId, String nodeId, String msgStr) { } ChainContext context = ContextManager.getContext(chainId); NulsLogger logger = context.getLogger(); - logger.debug("recieve " + message + " from node-" + nodeId); +// logger.debug("recieve " + message + " from node-" + nodeId); if(null == context.getDownloaderParams()){ return; } diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java b/module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java index 4edbf376da..f7254aa649 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java +++ b/module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java @@ -477,6 +477,42 @@ public Response getBlockByHeight(Map map) { } } + /** + * 根据高度获取区块 + * + * @param map + * @return + */ + @CmdAnnotation(cmd = "roll_back", version = 1.0, description = "Roll back a number of blocks") + @Parameters({ + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), + @Parameter(parameterName = "height", requestType = @TypeDescriptor(value = long.class), parameterDes = "区块高度") + }) + @ResponseData(name = "返回值", description = "successful", responseType = @TypeDescriptor(value = String.class)) + public Response rollback(Map map) { + try { + int chainId = Integer.parseInt(map.get(Constants.CHAIN_ID).toString()); + ChainContext context = ContextManager.getContext(chainId); + if (context == null) { + return success(); + } + long count = Long.parseLong(map.get("height").toString()); + Block block = service.getLatestBlock(chainId); + for (long height = block.getHeader().getHeight(); height > block.getHeader().getHeight() - count; height--) { + service.rollbackBlock(chainId, height, true); + } + Map responseData = new HashMap<>(2); + if (block == null) { + return success(responseData); + } + responseData.put("value", "success"); + return success(responseData); + } catch (Exception e) { + COMMON_LOG.error("", e); + return failed(e.getMessage()); + } + } + /** * 根据hash获取区块头 * @@ -499,7 +535,7 @@ public Response getBlockHeaderByHash(Map map) { NulsHash hash = NulsHash.fromHex(map.get("hash").toString()); BlockHeader blockHeader = service.getBlockHeader(chainId, hash); Map responseData = new HashMap<>(2); - if(blockHeader == null) { + if (blockHeader == null) { return success(responseData); } responseData.put("value", RPCUtil.encode(blockHeader.serialize())); @@ -532,7 +568,7 @@ public Response getBlockHeaderPoByHash(Map map) { NulsHash hash = NulsHash.fromHex(map.get("hash").toString()); BlockHeaderPo blockHeader = service.getBlockHeaderPo(chainId, hash); Map responseData = new HashMap<>(2); - if(blockHeader == null) { + if (blockHeader == null) { return success(responseData); } responseData.put("value", RPCUtil.encode(blockHeader.serialize())); @@ -565,7 +601,7 @@ public Response getBlockByHash(Map map) { NulsHash hash = NulsHash.fromHex(map.get("hash").toString()); Block block = service.getBlock(chainId, hash); Map responseData = new HashMap<>(2); - if(block == null) { + if (block == null) { return success(responseData); } responseData.put("value", RPCUtil.encode(block.serialize())); diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java index a38b474374..af0356f5c1 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java @@ -108,7 +108,7 @@ public Response assetReg(Map params) { if (dbChain.isDelete()) { return failed(CmErrorCode.ERROR_CHAIN_REG_CMD); } - if (assetService.assetExist(asset) && asset.isAvailable()) { + if (assetService.assetExistAndAvailable(asset)) { return failed(CmErrorCode.ERROR_ASSET_ID_EXIST); } /* 组装交易发送 (Send transaction) */ diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/AssetService.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/AssetService.java index ee8a30bf54..af0e3af5f2 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/AssetService.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/AssetService.java @@ -81,6 +81,8 @@ public interface AssetService { */ boolean assetExist(Asset asset) throws Exception; + boolean assetExistAndAvailable(Asset asset) throws Exception; + /** * juge asset exist in chain * diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java index 9d6bc0fee6..823054994b 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java @@ -57,4 +57,5 @@ public interface ValidateService { ChainEventResult batchChainRegValidatorV7(BlockChain blockChain, Asset asset, Map tempChains, Map tempAssets) throws Exception; ChainEventResult batchAssetRegValidatorV7(Asset asset, Map tempAssets) throws Exception; + ChainEventResult batchAssetRegValidatorV12(Asset asset, Map tempAssets) throws Exception; } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java index 99fc4c219f..5bf30af682 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java @@ -233,6 +233,12 @@ public boolean assetExist(Asset asset) throws Exception { return dbAsset != null; } + @Override + public boolean assetExistAndAvailable(Asset asset) throws Exception { + Asset dbAsset = assetStorage.load(CmRuntimeInfo.getAssetKey(asset.getChainId(), asset.getAssetId())); + return dbAsset != null&&dbAsset.isAvailable(); + } + @Override public boolean assetExist(Asset asset, Map map) throws Exception { String assetKey = CmRuntimeInfo.getAssetKey(asset.getChainId(), asset.getAssetId()); diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java index 2de46b5622..d4e67d55b6 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java @@ -337,6 +337,30 @@ public ChainEventResult batchAssetRegValidatorV7(Asset asset, Map tempAssets) throws Exception { + if (assetService.regChainAssetExist(asset, tempAssets)) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_ID_EXIST); + } + if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DECIMALPLACES); + } + if (!FormatValidUtils.validTokenNameOrSymbol(asset.getSymbol())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_SYMBOL); + } + if (!FormatValidUtils.validTokenNameOrSymbol(asset.getAssetName())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_NAME); + } + //判断黑洞资产与锁定资产 +// if (!BigIntegerUtils.isEqual(asset.getDepositNuls(), nulsChainConfig.getAssetDepositNuls())) { +// return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DEPOSITNULS); +// } +// if (!BigIntegerUtils.isEqual(asset.getDestroyNuls(), nulsChainConfig.getAssetDestroyNuls())) { +// return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DEPOSITNULS); // } return ChainEventResult.getResultSuccess(); } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java new file mode 100644 index 0000000000..80be561dce --- /dev/null +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java @@ -0,0 +1,109 @@ +package io.nuls.chain.service.tx.v12; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.chain.info.CmRuntimeInfo; +import io.nuls.chain.model.dto.ChainEventResult; +import io.nuls.chain.model.po.Asset; +import io.nuls.chain.rpc.call.RpcService; +import io.nuls.chain.service.*; +import io.nuls.chain.util.LoggerUtil; +import io.nuls.chain.util.TxUtil; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component("AddAssetTxProcessorV12") +public class AddAssetTransferProcessor implements TransactionProcessor { + @Autowired + private ValidateService validateService; + @Autowired + private CacheDataService cacheDataService; + @Autowired + private AssetService assetService; + @Autowired + private ChainService chainService; + @Autowired + private RpcService rpcService; + @Autowired + CmTransferService cmTransferService; + + @Override + public int getType() { + return TxType.ADD_ASSET_TO_CHAIN; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + List errorList = new ArrayList<>(); + Map rtData = new HashMap<>(2); + rtData.put("errorCode", ""); + rtData.put("txList", errorList); + try { + Map assetMap = new HashMap<>(); + Asset asset = null; + ChainEventResult chainEventResult = ChainEventResult.getResultSuccess(); + for (Transaction tx : txs) { + String txHash = tx.getHash().toHex(); + asset = TxUtil.buildAssetWithTxAssetV5(tx); + String assetKey = CmRuntimeInfo.getAssetKey(asset.getChainId(), asset.getAssetId()); + chainEventResult = validateService.batchAssetRegValidatorV12(asset, assetMap); + if (chainEventResult.isSuccess()) { + assetMap.put(assetKey, 1); + LoggerUtil.logger().debug("txHash = {},assetKey={} reg batchValidate success!", txHash, assetKey); + } else { + rtData.put("errorCode", chainEventResult.getErrorCode().getCode()); + LoggerUtil.logger().error("txHash = {},assetKey={} reg batchValidate fail!", txHash, assetKey); + errorList.add(tx); + } + } + } catch (Exception e) { + LoggerUtil.logger().error(e); + throw new RuntimeException(e); + } + return rtData; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + long commitHeight = blockHeader.getHeight(); + List assets = new ArrayList<>(); + Asset asset = null; + try { + for (Transaction tx : txs) { + asset = TxUtil.buildAssetWithTxAssetV5(tx); + assetService.registerAsset(asset); + assets.add(asset); + } + } catch (Exception e) { + LoggerUtil.logger().error(e); + //通知远程调用回滚 + try { + //进行回滚 + cacheDataService.rollBlockTxs(chainId, commitHeight); + } catch (Exception e1) { + LoggerUtil.logger().error(e); + throw new RuntimeException(e); + } + return false; + } + rpcService.registerCrossAsset(assets, blockHeader.getTime()); + return true; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + return cmTransferService.rollbackV3(chainId, txs, blockHeader); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} diff --git a/module/nuls-chain-manager/src/main/resources/protocol-config.json b/module/nuls-chain-manager/src/main/resources/protocol-config.json index 6fe2b3cdd1..faa6d7d0f0 100644 --- a/module/nuls-chain-manager/src/main/resources/protocol-config.json +++ b/module/nuls-chain-manager/src/main/resources/protocol-config.json @@ -1,4 +1,22 @@ [ + { + "version": "12", + "extend": "7", + "validTxs": [ + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV12" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { "version": "7", "extend": "", diff --git a/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java b/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java index a2be612bd6..a554286196 100644 --- a/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java +++ b/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java @@ -1,44 +1,81 @@ -/* - * MIT License - * Copyright (c) 2017-2019 nuls.io - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package io.nuls.chain.test; - -import io.nuls.base.data.Transaction; -import io.nuls.chain.model.tx.txdata.TxChain; -import io.nuls.core.crypto.HexUtil; -import io.nuls.core.exception.NulsException; -import org.junit.Test; - -/** - * @author Niels - */ -public class RegCrossChainTxTest { - - @Test - public void test() throws NulsException { - String hex = "0b007821ca5d00fd1401057465737431013104585858585227000001030000000300255858586341376b6165514d506169524e507051534550385338744e584446654335766e4579255858586341376b61694b335968436453786658616166664875704244506a6d337665694545255858586341376b615959325172524658374c6539596477747a51394a7674525555333762784200c80063000100035858580358585800205fa012000000000000000000000000000000000000000000000000000000005847f80d00000000000000000000000000000000000000000000000000000000a0724e180900000000000000000000000000000000000000000000000000000800170200019a7c5f842094a73eb489d5678e446e3be57d689afd140101170200019a7c5f842094a73eb489d5678e446e3be57d689a02000100a03e66d94500000000000000000000000000000000000000000000000000000008d8a5882e038977e700031702000199092280b81a34b28901654601bbaa764ea0b385020001000040be40250000000000000000000000000000000000000000000000000000000000000000000000170200019a7c5f842094a73eb489d5678e446e3be57d689a0200010000205fa012000000000000000000000000000000000000000000000000000000ffffffffffffffff1702000129cfc6376255a78451eeb4b129ed8eacffa2feef02000100005847f80d00000000000000000000000000000000000000000000000000000000000000000000006b2102ff3511b8aabd6f598bda6b344a231a2bda8ffd236c13ef746342b0554a9839b7483046022100ecb92a5c6023cf398c62e964d9ef2428b4ec4a2c7ca8d5e75440430ce1696764022100e1f673547f9e0505c1d35b8ce74158f5e67cc483afc77461925dc9f0480bc3d3"; - Transaction transaction = new Transaction(); - transaction.parse(HexUtil.decode(hex),0); - TxChain txChain = new TxChain(); - txChain.parse(transaction.getTxData(),0); - System.out.println(txChain); - - } -} +///* +// * MIT License +// * Copyright (c) 2017-2019 nuls.io +// * Permission is hereby granted, free of charge, to any person obtaining a copy +// * of this software and associated documentation files (the "Software"), to deal +// * in the Software without restriction, including without limitation the rights +// * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// * copies of the Software, and to permit persons to whom the Software is +// * furnished to do so, subject to the following conditions: +// * The above copyright notice and this permission notice shall be included in all +// * copies or substantial portions of the Software. +// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// * SOFTWARE. +// */ +// +//package io.nuls.chain.test; +// +//import io.nuls.base.data.Address; +//import io.nuls.base.data.Transaction; +//import io.nuls.base.signture.TransactionSignature; +//import io.nuls.chain.model.tx.txdata.TxChain; +//import io.nuls.core.constant.BaseConstant; +//import io.nuls.core.crypto.HexUtil; +//import io.nuls.core.exception.NulsException; +//import io.nuls.core.log.Log; +//import io.nuls.core.parse.SerializeUtils; +//import io.nuls.core.rockdb.service.RocksDBService; +//import org.junit.Test; +// +//import java.util.HashSet; +//import java.util.Set; +// +///** +// * @author Niels +// */ +//public class RegCrossChainTxTest { +// +// static String DB_PATH = "/Users/zhoulijun/workspace/nuls/resend-cross-tx/chain-manager"; +// +// static final String TABLE = "block_chain"; +// +// public static void readBlockChain() throws NulsException { +// RocksDBService.init(DB_PATH); +// byte[] b = RocksDBService.get(TABLE, TABLE.getBytes()); +// byte[] b = RocksDBService.entryList("block_chain"); +//// Log.info("{}", HexUtil.encode(b)); +// CtxStatusPO ctx = new CtxStatusPO(); +// try { +// ctx.parse(b, 0); +// Transaction tx = ctx.getTx(); +// TransactionSignature signature = new TransactionSignature(); +// signature.parse(tx.getTransactionSignature(), 0); +// Log.info("{}", HexUtil.encode(tx.serialize())); +// Log.info("{}",tx.getType()); +// Log.info("{}", signature.getSignersCount()); +// Set addressSets = new HashSet<>(); +// signature.getP2PHKSignatures().forEach(sign -> { +// Address address = new Address(CHAIN_ID, QZ, BaseConstant.DEFAULT_ADDRESS_TYPE, SerializeUtils.sha256hash160(sign.getPublicKey())); +// Log.info("{}", address.getBase58()); +// addressSets.add(address.getBase58()); +// }); +// if(addressSets.size() < 61){ +// Log.info("hash : {}:{}",hash,addressSets.size()); +// sets.add(hash); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// +// +// @Test +// public void test() throws NulsException { +// +// } +//} diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandHandler.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandHandler.java index d573082d69..d5ef521773 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandHandler.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandHandler.java @@ -31,6 +31,7 @@ import io.nuls.cmd.client.processor.account.*; import io.nuls.cmd.client.processor.block.GetBestBlockHeaderProcessor; import io.nuls.cmd.client.processor.block.GetBlockHeaderProcessor; +import io.nuls.cmd.client.processor.block.RollbackProcessor; import io.nuls.cmd.client.processor.consensus.*; import io.nuls.cmd.client.processor.contract.*; import io.nuls.cmd.client.processor.crosschain.*; @@ -119,6 +120,7 @@ public void afterPropertiesSet() throws NulsException { register(getBean(GetBestBlockHeaderProcessor.class)); //get block header by hash or height register(getBean(GetBlockHeaderProcessor.class)); + register(getBean(RollbackProcessor.class)); //get tx by hash register(getBean(GetTxProcessor.class)); diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/Tools.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/Tools.java index 52145eadea..cd467623b2 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/Tools.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/Tools.java @@ -6,6 +6,7 @@ import io.nuls.core.constant.BaseConstant; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.crypto.ECKey; +import io.nuls.core.crypto.HexUtil; import io.nuls.core.parse.SerializeUtils; /** @@ -58,4 +59,6 @@ public static void main(String[] args) { } } + + } diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/account/GetPrivateKeyProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/account/GetPrivateKeyProcessor.java index 3fe1578f8d..8b5ecd4359 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/account/GetPrivateKeyProcessor.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/account/GetPrivateKeyProcessor.java @@ -72,7 +72,7 @@ public boolean argsValidate(String[] args) { @Override public CommandResult execute(String[] args) { String address = args[1]; - String password = getPwd("Enter your account password"); + String password = getPwd("Enter your account password:"); Result result = accountService.getAccountPrivateKey(new GetAccountPrivateKeyByAddressReq(password,address)); if(result.isFailed()){ return CommandResult.getFailed(result); diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/block/RollbackProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/block/RollbackProcessor.java new file mode 100644 index 0000000000..42b14cb677 --- /dev/null +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/block/RollbackProcessor.java @@ -0,0 +1,97 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.cmd.client.processor.block; + + +import io.nuls.base.api.provider.Result; +import io.nuls.base.api.provider.ServiceManager; +import io.nuls.base.api.provider.block.BlockService; +import io.nuls.base.api.provider.block.facade.BlockHeaderData; +import io.nuls.base.api.provider.block.facade.GetBlockHeaderByHashReq; +import io.nuls.base.api.provider.block.facade.GetBlockHeaderByHeightReq; +import io.nuls.base.api.provider.block.facade.GetBlockHeaderByLastHeightReq; +import io.nuls.cmd.client.CommandBuilder; +import io.nuls.cmd.client.CommandResult; +import io.nuls.cmd.client.processor.CommandGroup; +import io.nuls.cmd.client.processor.CommandProcessor; +import io.nuls.core.core.annotation.Component; + +import java.util.regex.Matcher; + +/** + * @author: Charlie + */ +@Component +public class RollbackProcessor implements CommandProcessor { + + + BlockService blockService = ServiceManager.get(BlockService.class); + + @Override + public String getCommand() { + return "rollback"; + } + + @Override + public CommandGroup getGroup() { + return CommandGroup.Block; + } + + @Override + public String getHelp() { + CommandBuilder builder = new CommandBuilder(); + builder.newLine(getCommandDescription()) + .newLine("\t block count - Required"); + return builder.toString(); + } + + @Override + public String getCommandDescription() { + return "rollback -- Roll back a number of blocks"; + } + + @Override + public boolean argsValidate(String[] args) { + checkArgsNumber(args,1); + return true; + } + + @Override + public CommandResult execute(String[] args) { + String hash = args[1]; + Matcher matcher = IS_NUMBERIC.matcher(args[1]); + Long height = Long.parseLong(args[1]); + if(height>1000){ + return CommandResult.getFailed("The count is too big"); + } + Result result = blockService.rollback(new GetBlockHeaderByHeightReq(height)); + + if(result.isFailed()){ + return CommandResult.getFailed(result); + } + return CommandResult.getSuccess(result); + } +} diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/CreateAgentProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/CreateAgentProcessor.java index 5a46100ce3..96e9a8dab2 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/CreateAgentProcessor.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/CreateAgentProcessor.java @@ -81,7 +81,7 @@ public boolean argsValidate(String[] args) { @Override public CommandResult execute(String[] args) { String agentAddress = args[1]; - String password = getPwd("Enter agent address password"); + String password = getPwd("Enter agent address password:"); String packingAddress = args[2]; Integer commissionRate = Integer.parseInt(args[3]); diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/StopAgentProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/StopAgentProcessor.java index c4160eb1b0..6216d9de09 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/StopAgentProcessor.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/StopAgentProcessor.java @@ -78,7 +78,7 @@ public boolean argsValidate(String[] args) { @Override public CommandResult execute(String[] args) { String address = args[1]; - String password = getPwd("Enter your account password"); + String password = getPwd("Enter your account password:"); Result result = consensusProvider.stopAgent(new StopAgentReq(address,password)); if (result.isFailed()) { return CommandResult.getFailed(result); diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/crosschain/GetCrossTxStateProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/crosschain/GetCrossTxStateProcessor.java index 1d6d2bfc83..6d940a1efa 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/crosschain/GetCrossTxStateProcessor.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/crosschain/GetCrossTxStateProcessor.java @@ -2,9 +2,20 @@ import io.nuls.base.api.provider.Result; import io.nuls.base.api.provider.crosschain.facade.GetCrossTxStateReq; +import io.nuls.base.data.Address; +import io.nuls.base.data.Transaction; +import io.nuls.base.signture.TransactionSignature; import io.nuls.cmd.client.CommandBuilder; import io.nuls.cmd.client.CommandResult; +import io.nuls.core.constant.BaseConstant; import io.nuls.core.core.annotation.Component; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.log.Log; +import io.nuls.core.parse.SerializeUtils; +import io.nuls.core.rockdb.service.RocksDBService; + +import java.util.HashSet; +import java.util.Set; /** * @Author: zhoulijun @@ -14,6 +25,8 @@ @Component public class GetCrossTxStateProcessor extends CrossChainBaseProcessor { + + @Override public String getCommand() { return "getcrosstxstate"; @@ -42,11 +55,35 @@ public boolean argsValidate(String[] args) { public CommandResult execute(String[] args) { Integer chainId = config.getChainId(); String txHash = args[1]; - Result result = crossChainProvider.getCrossTxState(new GetCrossTxStateReq(chainId,txHash)); + GetCrossTxStateReq req = new GetCrossTxStateReq(chainId,txHash); + Result result = crossChainProvider.getCrossTxState(req); + Result resultTxInfo = crossChainProvider.getCrossTx(req); + signList(resultTxInfo.getData()); if (result.isFailed()) { return CommandResult.getFailed(result); } String state = result.getData() + "(0:Unconfirmed 1:MainNetConfirmed 2:Confirmed)"; return CommandResult.getSuccess(state); } + + public void signList(Transaction tx) { + try{ + TransactionSignature signature = new TransactionSignature(); + signature.parse(tx.getTransactionSignature(), 0); + Log.debug("txHex:{}", HexUtil.encode(tx.serialize())); + Log.debug("txType:{}",tx.getType()); + Log.debug("txSignCount:{}", signature.getSignersCount()); + Set addressSets = new HashSet<>(); + Log.debug("signer:"); + signature.getP2PHKSignatures().forEach(sign -> { + Address address = new Address(config.getChainId(), config.getAddressPrefix(), BaseConstant.DEFAULT_ADDRESS_TYPE, SerializeUtils.sha256hash160(sign.getPublicKey())); + addressSets.add(address.getBase58()); + }); + addressSets.forEach((addr)->Log.debug("{}",addr)); + } catch (Exception e) { + e.printStackTrace(); + } + } + + } diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/TransferByAliasProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/TransferByAliasProcessor.java index 216c88a699..efe2321dff 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/TransferByAliasProcessor.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/TransferByAliasProcessor.java @@ -113,7 +113,7 @@ private TransferReq buildTransferReq(String[] args) { BigInteger amount = new BigInteger(args[3]); TransferReq.TransferReqBuilder builder = new TransferReq.TransferReqBuilder(config.getChainId(),config.getAssetsId()) - .addForm(formAddress,getPwd("Enter your account password"), amount) + .addForm(formAddress,getPwd("Enter your account password:"), amount) .addTo(toAddress,amount); if(args.length == 5){ builder.setRemark(args[4]); diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java index 7f7196ac23..efde0d5dfc 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java @@ -18,12 +18,14 @@ import io.nuls.poc.constant.ConsensusConfig; import io.nuls.poc.constant.ConsensusConstant; import io.nuls.poc.model.bo.Chain; +import io.nuls.poc.model.po.AgentPo; import io.nuls.poc.rpc.call.CallMethodUtils; import io.nuls.poc.utils.enumeration.ConsensusStatus; import io.nuls.poc.utils.manager.ChainManager; import java.lang.reflect.Field; import java.nio.charset.Charset; +import java.util.List; import java.util.Set; import static java.nio.charset.StandardCharsets.UTF_8; @@ -172,5 +174,25 @@ private void initSys() throws Exception { private void initDB() throws Exception { RocksDBService.init(consensusConfig.getDataFolder()); RocksDBService.createTable(ConsensusConstant.DB_NAME_CONSUME_CONGIF); + if (consensusConfig.getMainChainId() != 1) { + return; + } + +// List list2 = RocksDBService.valueList("consensus_agent1"); +// for (byte[] arr : list2) { +// AgentPo po = new AgentPo(); +// po.parse(arr, 0); +// boolean up = false; +// if (po.getHash().toHex().equals("44fd2f9ab6d0833024a4f77d601ff34c19b7a01490dcf01659034f7013c980f1") && po.getDelHeight() < 7865610L) { +// po.setDelHeight(30L); +// up = true; +// } +// if (up) { +// byte[] key = po.getHash().getBytes(); +// byte[] value = po.serialize(); +// RocksDBService.put("consensus_agent1", key, value); +// } +// } + } -} +} \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java index b377a6713c..e87d8d7615 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java @@ -130,7 +130,7 @@ public class Agent extends BaseNulsData { /** * 总委托金额，用于页面展示（由于2.4.1智能合约BUG引起，临时添加字段，后续版本需要删除） - * todo + * * */ private transient BigInteger reTotalDeposit = BigInteger.ZERO; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java new file mode 100644 index 0000000000..325100940d --- /dev/null +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java @@ -0,0 +1,89 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.poc.model.bo.tx.txdata; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.BaseNulsData; +import io.nuls.base.data.NulsHash; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +/** + * 停止节点信息类 + * Stop Node Information Class + * + * @author tag + * 2018/11/20 + */ +public class DelayStopAgent extends BaseNulsData { + + private NulsHash agentHash; + + private long height; + + /** + * serialize important field + */ + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(this.agentHash.getBytes()); + stream.writeUint32(height); + + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.agentHash = byteBuffer.readHash(); + this.height = byteBuffer.readUint32(); + } + + @Override + public int size() { + return this.agentHash.getBytes().length + SerializeUtils.sizeOfUint32(); + } + + public NulsHash getAgentHash() { + return agentHash; + } + + public void setAgentHash(NulsHash agentHash) { + this.agentHash = agentHash; + } + + public long getHeight() { + return height; + } + + public void setHeight(long height) { + this.height = height; + } +} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java index f5419e4166..53cac320d5 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java @@ -1,5 +1,6 @@ package io.nuls.poc.rpc.cmd; +import io.nuls.base.data.CoinData; import io.nuls.core.rpc.model.*; import io.nuls.poc.model.dto.output.AgentDTO; import io.nuls.poc.service.AgentService; @@ -14,9 +15,10 @@ /** * 共识节点相关接口 + * * @author tag * 2018/11/7 - * */ + */ @Component public class AgentCmd extends BaseCmd { @Autowired @@ -24,7 +26,7 @@ public class AgentCmd extends BaseCmd { /** * 创建节点 - * */ + */ @CmdAnnotation(cmd = "cs_createAgent", version = 1.0, description = "创建节点交易/create agent transaction") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @Parameter(parameterName = "agentAddress", parameterType = "String", parameterDes = "节点地址") @@ -36,9 +38,9 @@ public class AgentCmd extends BaseCmd { @ResponseData(name = "返回值", description = "创建节点交易HASH", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "txHash", description = "创建节点交易HASH") })) - public Response createAgent(Map params){ + public Response createAgent(Map params) { Result result = service.createAgent(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -46,7 +48,7 @@ public Response createAgent(Map params){ /** * 注销节点 - * */ + */ @CmdAnnotation(cmd = "cs_stopAgent", version = 1.0, description = "注销节点/stop agent") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @Parameter(parameterName = "address", parameterType = "String", parameterDes = "节点地址") @@ -54,9 +56,25 @@ public Response createAgent(Map params){ @ResponseData(name = "返回值", description = "停止节点交易HASH", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "txHash", description = "停止节点交易HASH") })) - public Response stopAgent(Map params){ + public Response stopAgent(Map params) { Result result = service.stopAgent(params); - if(result.isFailed()){ + if (result.isFailed()) { + return failed(result.getErrorCode()); + } + return success(result.getData()); + } + + /** + * 获取注销节点coindata + */ + @CmdAnnotation(cmd = "cs_getStopAgentCoinData", version = 1.0, description = "获取注销节点CoinData") + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") + @Parameter(parameterName = "agentHash", parameterType = "String", parameterDes = "节点hash") + @Parameter(parameterName = "lockHeight", parameterType = "Long", parameterDes = "锁定高度") + @ResponseData(name = "返回值", description = "停止节点交易CoinData的Hex", responseType = @TypeDescriptor(value = String.class)) + public Response cs_getStopAgentCoinData(Map params) { + Result result = service.getStopAgentCoinData(params); + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -64,7 +82,7 @@ public Response stopAgent(Map params){ /** * 查询共识节点列表 - * */ + */ @CmdAnnotation(cmd = "cs_getAgentList", version = 1.0, description = "查询当前网络中的共识节点列表/Query the list of consensus nodes in the current network") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @Parameter(parameterName = "pageNumber", requestType = @TypeDescriptor(value = int.class), parameterDes = "页码", canNull = true) @@ -73,9 +91,9 @@ public Response stopAgent(Map params){ @ResponseData(name = "返回值", description = "返回一个Page对象，这里只描述Page对象中的集合", responseType = @TypeDescriptor(value = List.class, collectionElement = AgentDTO.class) ) - public Response getAgentList(Map params){ + public Response getAgentList(Map params) { Result result = service.getAgentList(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -83,14 +101,14 @@ public Response getAgentList(Map params){ /** * 查询指定节点信息 - * */ + */ @CmdAnnotation(cmd = "cs_getAgentInfo", version = 1.0, description = "查询指点节点节点详细信息/Query pointer node details") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @Parameter(parameterName = "agentHash", parameterType = "String", parameterDes = "节点HASH") @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = AgentDTO.class)) - public Response getAgentInfo(Map params){ + public Response getAgentInfo(Map params) { Result result = service.getAgentInfo(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -98,15 +116,15 @@ public Response getAgentInfo(Map params){ /** * 获取当前节点出块地址 - * */ + */ @CmdAnnotation(cmd = "cs_getNodePackingAddress", version = 1.0, description = "获取当前节点出块地址/Get the current node's out-of-block address") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @ResponseData(name = "返回值", description = "当前节点出块地址", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "packAddress", description = "当前节点出块地址") })) - public Response getNodePackingAddress(Map params){ + public Response getNodePackingAddress(Map params) { Result result = service.getNodePackingAddress(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -114,15 +132,15 @@ public Response getNodePackingAddress(Map params){ /** * 获取所有节点出块地址/指定N个区块出块地址 - * */ + */ @CmdAnnotation(cmd = "cs_getAgentAddressList", version = 1.0, description = "获取当前网络共识节点出块地址列表或则查询最近N个区块的出块地址/Get all node out-of-block addresses or specify N block out-of-block designations") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @ResponseData(name = "返回值", description = "共识节点列表", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "packAddress", description = "共识节点列表") })) - public Response getAgentAddressList(Map params){ + public Response getAgentAddressList(Map params) { Result result = service.getAgentAddressList(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -130,16 +148,16 @@ public Response getAgentAddressList(Map params){ /** * 查询指定共识节点状态 - * */ + */ @CmdAnnotation(cmd = "cs_getAgentStatus", version = 1.0, description = "查询指定共识节点状态/query the specified consensus node status 1.0") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @Parameter(parameterName = "agentHash", parameterType = "String", parameterDes = "节点HASH") @ResponseData(name = "返回值", description = "节点状态", responseType = @TypeDescriptor(value = Map.class, mapKeys = { - @Key(name = "status",valueType = Byte.class, description = "节点状态") + @Key(name = "status", valueType = Byte.class, description = "节点状态") })) - public Response getAgentStatus(Map params){ + public Response getAgentStatus(Map params) { Result result = service.getAgentStatus(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -147,13 +165,13 @@ public Response getAgentStatus(Map params){ /** * 修改节点共识状态 - * */ + */ @CmdAnnotation(cmd = "cs_updateAgentConsensusStatus", version = 1.0, description = "修改节点共识状态/modifying the Node Consensus State") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @ResponseData(description = "无特定返回值，无错误则表示节点共识状态修改成功") - public Response updateAgentConsensusStatus(Map params){ + public Response updateAgentConsensusStatus(Map params) { Result result = service.updateAgentConsensusStatus(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -161,14 +179,14 @@ public Response updateAgentConsensusStatus(Map params){ /** * 修改节点打包状态 - * */ + */ @CmdAnnotation(cmd = "cs_updateAgentStatus", version = 1.0, description = "修改节点打包状态/modifying the Packing State of Nodes") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @Parameter(parameterName = "status", requestType = @TypeDescriptor(value = int.class), parameterDes = "节点状态") @ResponseData(description = "无特定返回值，无错误则表示节点打包状态修改成功") - public Response updateAgentStatus(Map params){ + public Response updateAgentStatus(Map params) { Result result = service.updateAgentStatus(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -176,7 +194,7 @@ public Response updateAgentStatus(Map params){ /** * 获取当前节点的出块账户信息 - * */ + */ @CmdAnnotation(cmd = "cs_getPackerInfo", version = 1.0, description = "获取当前节点的出块账户信息/modifying the Packing State of Nodes") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @@ -184,9 +202,9 @@ public Response updateAgentStatus(Map params){ @Key(name = "password", description = "当前节点密码"), @Key(name = "packAddressList", valueType = List.class, valueElement = String.class, description = "当前打包地址列表"), })) - public Response getPackerInfo(Map params){ + public Response getPackerInfo(Map params) { Result result = service.getPackerInfo(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); @@ -194,7 +212,7 @@ public Response getPackerInfo(Map params){ /** * 获取当前节点的出块账户信息 - * */ + */ @CmdAnnotation(cmd = "cs_getSeedNodeInfo", version = 1.0, description = "获取种子节点信息/get seed node info") @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id") @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @@ -202,9 +220,9 @@ public Response getPackerInfo(Map params){ @Key(name = "password", description = "当前节点密码"), @Key(name = "packAddressList", valueType = List.class, valueElement = String.class, description = "当前打包地址列表"), })) - public Response getSeedNodeInfo(Map params){ + public Response getSeedNodeInfo(Map params) { Result result = service.getSeedNodeInfo(params); - if(result.isFailed()){ + if (result.isFailed()) { return failed(result.getErrorCode()); } return success(result.getData()); diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java index ecf46bb589..300d9aadd9 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java @@ -98,4 +98,6 @@ public interface AgentService { * @return Result * */ Result getSeedNodeInfo(Map params); + + Result getStopAgentCoinData(Map params); } diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java index c9c4f91541..f3aaa38951 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java @@ -12,6 +12,7 @@ import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; +import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.log.Log; @@ -120,7 +121,7 @@ public Result createAgent(Map params) { Agent agent = TxUtil.createAgent(dto); tx.setTxData(agent.serialize()); //3.2.组装coinData - CoinData coinData = coinDataManager.getCoinData(agent.getAgentAddress(), chain, new BigInteger(dto.getDeposit()), ConsensusConstant.CONSENSUS_LOCK_TIME, tx.size() + P2PHKSignature.SERIALIZE_LENGTH,chain.getConfig().getAgentChainId(),chain.getConfig().getAgentAssetId()); + CoinData coinData = coinDataManager.getCoinData(agent.getAgentAddress(), chain, new BigInteger(dto.getDeposit()), ConsensusConstant.CONSENSUS_LOCK_TIME, tx.size() + P2PHKSignature.SERIALIZE_LENGTH, chain.getConfig().getAgentChainId(), chain.getConfig().getAgentAssetId()); tx.setCoinData(coinData.serialize()); //4.交易签名 String priKey = (String) callResult.get("priKey"); @@ -183,6 +184,44 @@ public Result createAgentValid(Map params) { } } + @Override + public Result getStopAgentCoinData(Map params) { + int chainId; + String agentHash; + long lockHeight; + try { + chainId = (int) params.get("chainId"); + agentHash = (String) params.get("agentHash"); + lockHeight = Long.parseLong("" + params.get("lockHeight")); + ObjectUtils.canNotEmpty(agentHash, "agentHash can not be null"); + } catch (Exception e) { + return Result.getFailed(ConsensusErrorCode.PARAM_ERROR); + } + Chain chain = chainManager.getChainMap().get(chainId); + if (chain == null) { + return Result.getFailed(ConsensusErrorCode.CHAIN_NOT_EXIST); + } + List agentList = chain.getAgentList(); + Agent agent = null; + for (Agent a : agentList) { + if (a.getTxHash().toHex().equals(agentHash)) { + agent = a; + break; + } + } + try { + CoinData coinData = coinDataManager.getStopAgentCoinData(chain, agent, lockHeight); + if (null != coinData) { + Map result = new HashMap<>(); + result.put("value", HexUtil.encode(coinData.serialize())); + return Result.getSuccess(ConsensusErrorCode.SUCCESS).setData(result); + } + } catch (Exception e) { + chain.getLogger().error(e); + } + return Result.getFailed(ConsensusErrorCode.DATA_NOT_FOUND); + } + /** * 停止节点 */ @@ -593,12 +632,12 @@ public Result getPackerInfo(Map params) { resultMap.put("password", chain.getConfig().getPassword()); } List packAddressList = new ArrayList<>(); - if(round != null){ + if (round != null) { for (MeetingMember meetingMember : round.getMemberList()) { packAddressList.add(AddressTool.getStringAddressByBytes(meetingMember.getAgent().getPackingAddress())); } - }else { - if(chain.isCacheLoaded()) { + } else { + if (chain.isCacheLoaded()) { packAddressList = new ArrayList<>(Arrays.asList(chain.getConfig().getSeedNodes().split(","))); } } @@ -628,13 +667,13 @@ public Result getSeedNodeInfo(Map params) { List packAddressList = Arrays.asList(chain.getConfig().getSeedNodes().split(",")); MeetingRound round = roundManager.getCurrentRound(chain); MeetingMember member = null; - if(round != null){ + if (round != null) { member = round.getMyMember(); } Map resultMap = new HashMap<>(4); if (member != null) { String address = AddressTool.getStringAddressByBytes(member.getAgent().getPackingAddress()); - if(packAddressList.contains(address)){ + if (packAddressList.contains(address)) { resultMap.put("address", address); resultMap.put("password", chain.getConfig().getPassword()); } @@ -646,4 +685,5 @@ public Result getSeedNodeInfo(Map params) { return Result.getFailed(ConsensusErrorCode.DATA_ERROR); } } + } diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java index 07966b6d31..604bd448c8 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java @@ -44,6 +44,7 @@ public class BlockServiceImpl implements BlockService { @Autowired private BlockValidator blockValidator; + /** * 缓存最新区块 */ @@ -116,9 +117,9 @@ public Result receiveHeaderList(Map params) { try { List headerList = (List) params.get(ConsensusConstant.HEADER_LIST); List blockHeaderList = new ArrayList<>(); - for (String header:headerList) { + for (String header : headerList) { BlockHeader blockHeader = new BlockHeader(); - blockHeader.parse(RPCUtil.decode(header),0); + blockHeader.parse(RPCUtil.decode(header), 0); blockHeaderList.add(blockHeader); } List localBlockHeaders = chain.getBlockHeaderList(); @@ -162,11 +163,11 @@ public Result validBlock(Map params) { block.parse(new NulsByteBuffer(RPCUtil.decode(blockHex))); blockValidator.validate(isDownload, chain, block); Response response = CallMethodUtils.verify(chainId, block.getTxs(), block.getHeader(), chain.getNewestHeader(), chain.getLogger()); - if (response.isSuccess()) { + if ( response.isSuccess()) { Map responseData = (Map) response.getResponseData(); Map v = (Map) responseData.get("tx_batchVerify"); return Result.getSuccess(ConsensusErrorCode.SUCCESS).setData(v); - }else{ + } else { chain.getLogger().info("Block transaction validation failed!"); } } catch (NulsException e) { @@ -177,4 +178,4 @@ public Result validBlock(Map params) { } return Result.getFailed(ConsensusErrorCode.FAILED).setData(validResult); } -} +} \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java new file mode 100644 index 0000000000..7ad1098232 --- /dev/null +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java @@ -0,0 +1,257 @@ +package io.nuls.poc.tx.v4; + +import io.nuls.base.data.*; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; +import io.nuls.core.model.ByteUtils; +import io.nuls.core.parse.SerializeUtils; +import io.nuls.poc.constant.ConsensusErrorCode; +import io.nuls.poc.model.bo.Chain; +import io.nuls.poc.model.bo.tx.txdata.DelayStopAgent; +import io.nuls.poc.model.bo.tx.txdata.Deposit; +import io.nuls.poc.model.po.AgentPo; +import io.nuls.poc.model.po.DepositPo; +import io.nuls.poc.model.po.PunishLogPo; +import io.nuls.poc.storage.AgentStorageService; +import io.nuls.poc.storage.DepositStorageService; +import io.nuls.poc.utils.LoggerUtil; +import io.nuls.poc.utils.enumeration.PunishType; +import io.nuls.poc.utils.manager.ChainManager; +import io.nuls.poc.utils.manager.DepositManager; +import io.nuls.poc.utils.validator.TxValidator; + +import java.io.IOException; +import java.util.*; + +@Component("DelayStopAgentProcessorV1") +public class DelayStopAgentProcessor implements TransactionProcessor { + + @Autowired + private ChainManager chainManager; + @Autowired + private AgentStorageService agentStorageService; + @Autowired + private DepositStorageService depositStorageService; + @Autowired + private TxValidator txValidator; + @Autowired + private DepositManager depositManager; + + @Override + public int getType() { + return TxType.DELAY_STOP_AGENT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + Chain chain = chainManager.getChainMap().get(chainId); + Map result = new HashMap<>(2); + if (chain == null) { + LoggerUtil.commonLog.error("Chains do not exist."); + result.put("txList", txs); + result.put("errorCode", ConsensusErrorCode.CHAIN_NOT_EXIST.getCode()); + return result; + } + List invalidTxList = new ArrayList<>(); + String errorCode = null; + for (Transaction tx : txs) { + try { + if (!txValidator.validateTx(chain, tx)) { + invalidTxList.add(tx); + chain.getLogger().info("Delay stop agent transaction verification failed"); + continue; + } + } catch (NulsException e) { + invalidTxList.add(tx); + chain.getLogger().error("Intelligent Delay stop agent Transaction Verification Failed"); + chain.getLogger().error(e); + errorCode = e.getErrorCode().getCode(); + } catch (IOException io) { + invalidTxList.add(tx); + chain.getLogger().error("Intelligent Delay stop agent Transaction Verification Failed"); + chain.getLogger().error(io); + errorCode = ConsensusErrorCode.SERIALIZE_ERROR.getCode(); + } + } + result.put("txList", invalidTxList); + result.put("errorCode", errorCode); + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + Chain chain = chainManager.getChainMap().get(chainId); + if (chain == null) { + LoggerUtil.commonLog.error("Chains do not exist."); + return false; + } + List commitSuccessList = new ArrayList<>(); + boolean commitResult = true; + for (Transaction tx : txs) { + try { + if (realCommit(tx, chain, blockHeader)) { + commitSuccessList.add(tx); + } else { + commitResult = false; + } + } catch (NulsException e) { + chain.getLogger().error("Failure to red punish transaction submission"); + chain.getLogger().error(e); + commitResult = false; + } + } + //回滚已提交成功的交易 + if (!commitResult) { + for (Transaction rollbackTx : commitSuccessList) { + try { + realRollback(rollbackTx, chain, blockHeader); + } catch (NulsException e) { + chain.getLogger().error("Failure to red punish transaction rollback"); + chain.getLogger().error(e); + } + } + } + return commitResult; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + Chain chain = chainManager.getChainMap().get(chainId); + if (chain == null) { + LoggerUtil.commonLog.error("Chains do not exist."); + return false; + } + List rollbackSuccessList = new ArrayList<>(); + boolean rollbackResult = true; + for (Transaction tx : txs) { + try { + if (realRollback(tx, chain, blockHeader)) { + rollbackSuccessList.add(tx); + } else { + rollbackResult = false; + } + } catch (NulsException e) { + chain.getLogger().error("Failure to red punish transaction rollback"); + chain.getLogger().error(e); + rollbackResult = false; + } + } + //保存已回滚成功的交易 + if (!rollbackResult) { + for (Transaction commitTx : rollbackSuccessList) { + try { + realCommit(commitTx, chain, blockHeader); + } catch (NulsException e) { + chain.getLogger().error("Failure to red punish transaction submission"); + chain.getLogger().error(e); + } + } + } + return rollbackResult; + } + + + public boolean realCommit(Transaction tx, Chain chain, BlockHeader blockHeader) throws NulsException { + long blockHeight = blockHeader.getHeight(); + int chainId = chain.getConfig().getChainId(); + DelayStopAgent txData = new DelayStopAgent(); + txData.parse(tx.getTxData(), 0); + + /* + 找到被惩罚的节点 + Find the punished node + */ + AgentPo agent = agentStorageService.get(txData.getAgentHash(), chainId); + + if (null == agent) { + throw new NulsException(ConsensusErrorCode.AGENT_NOT_EXIST); + } + + /* + 找到被惩罚节点的委托 + Delegation to Find Penalized Nodes + */ + List depositPoList = depositStorageService.getList(chainId); + List updatedList = new ArrayList<>(); + for (DepositPo po : depositPoList) { + if (po.getDelHeight() >= 0) { + continue; + } + if (!po.getAgentHash().equals(txData.getAgentHash())) { + continue; + } + po.setDelHeight(blockHeight); + boolean b = depositStorageService.save(po, chainId); + if (!b) { + for (DepositPo po2 : updatedList) { + po2.setDelHeight(-1); + this.depositStorageService.save(po2, chainId); + } + throw new NulsException(ConsensusErrorCode.SAVE_FAILED); + } + updatedList.add(po); + } + /* + * 更新缓存 + * */ + if (!updatedList.isEmpty()) { + for (DepositPo depositPo : updatedList) { + depositManager.updateDeposit(chain, depositManager.poToDeposit(depositPo)); + } + } + return true; + } + + public boolean realRollback(Transaction tx, Chain chain, BlockHeader blockHeader) throws NulsException { + long blockHeight = blockHeader.getHeight(); + int chainId = chain.getConfig().getChainId(); + DelayStopAgent txData = new DelayStopAgent(); + txData.parse(tx.getTxData(), 0); + /* + 找到被惩罚的节点 + Find the punished node + */ + AgentPo agent1 = agentStorageService.get(txData.getAgentHash(), chainId); + + if (null == agent1) { + throw new NulsException(ConsensusErrorCode.AGENT_NOT_EXIST); + } + + /* + 找到被惩罚节点的委托 + Delegation to Find Penalized Nodes + */ + List depositPoList = depositStorageService.getList(chainId); + List updatedList = new ArrayList<>(); + for (DepositPo po : depositPoList) { + if (!po.getAgentHash().equals(txData.getAgentHash())) { + continue; + } + if (po.getDelHeight() == blockHeight) { + po.setDelHeight(-1); + } + boolean success = this.depositStorageService.save(po, chainId); + if (!success) { + for (DepositPo po2 : updatedList) { + po2.setDelHeight(blockHeight); + this.depositStorageService.save(po2, chainId); + } + throw new NulsException(ConsensusErrorCode.ROLLBACK_FAILED); + } + updatedList.add(po); + } + + /* + * 修改缓存 + * */ + if (!updatedList.isEmpty()) { + for (DepositPo po2 : updatedList) { + depositManager.updateDeposit(chain, depositManager.poToDeposit(po2)); + } + } + return true; + } +} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java new file mode 100644 index 0000000000..07af9f7cf3 --- /dev/null +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java @@ -0,0 +1,49 @@ +package io.nuls.poc.utils.manager; + +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.log.Log; +import io.nuls.poc.model.bo.tx.txdata.Agent; +import io.nuls.poc.model.po.AgentPo; +import io.nuls.poc.storage.AgentStorageService; + +@Component +public class FixRedPunishBugHelper { + + @Autowired + private AgentStorageService agentStorageService; + + /** + * This method is used to solve the problem of inconsistent node list caused by the massive node fork event that occurred on 2022-04-10. This method forces four nodes to stop at different heights, and then modifs the affected data through other transaction types to maintain the security and consistency of data on the main network. + * @param chainId + * @param agent + * @param startBlockHeight + */ + public void v13Filter(int chainId, Agent agent, long startBlockHeight) { + execute(chainId, "15673a9ab94fd5737ec541e3d6b289ea119268b361f0bfbe86b69a95f83c196f", startBlockHeight, 3718800L, agent); + execute(chainId, "a27170a4ad246758cc7fb45ded14b065f6a1919836a2bba34e6dcd9335a054da", startBlockHeight, 8083986L, agent); + execute(chainId, "ad82dc5237378a39abb3bbd8174ac0f77c882573a02c8fac01b4c7a058a96d90", startBlockHeight, 8083892L, agent); + execute(chainId, "d11d29e38b3db75aec0ebb69dc66eb4f6276d0a1d9c7faa6a4fa33b699637447", startBlockHeight, 8084009L, agent); + } + + private void execute(int chainId, String hash, long startBlockHeight, long deleteHeight, Agent agent) { + if (deleteHeight > startBlockHeight) { + return; + } + if (agent.getDelHeight() == deleteHeight) { + return; + } + if (!hash.equals(agent.getTxHash().toHex())) { + return; + } + agent.setDelHeight(deleteHeight); + agent.setStatus(0); + AgentPo po = this.agentStorageService.get(agent.getTxHash(), chainId); + if (null == po) { + return; + } + po.setDelHeight(deleteHeight); + this.agentStorageService.save(po, chainId); + Log.warn("update special agent:" + hash); + } +} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java index 7ffc621816..b374ea11f9 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java @@ -701,6 +701,9 @@ public boolean redPunishRollback(Transaction tx, Chain chain, BlockHeader blockH List depositPoList = depositStorageService.getList(chainId); List updatedList = new ArrayList<>(); for (DepositPo po : depositPoList) { + if(!po.getAgentHash().equals(agent.getHash())){ + continue; + } if (po.getDelHeight() == blockHeight) { po.setDelHeight(-1); } diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java index 2feeef0fb2..e6f406ab06 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java @@ -4,6 +4,7 @@ import io.nuls.base.data.BlockExtendsData; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; @@ -33,6 +34,10 @@ */ @Component public class RoundManager { + + @Autowired + private FixRedPunishBugHelper fixRedPunishBugHelper; + /** * 添加轮次信息到轮次列表中 * Add Round Information to Round List @@ -556,6 +561,7 @@ private List getAliveAgentList(Chain chain, long startBlockHeight) { List resultList = new ArrayList<>(); for (int i = agentList.size() - 1; i >= 0; i--) { Agent agent = agentList.get(i); + fixRedPunishBugHelper.v13Filter(chain.getConfig().getChainId(), agent,startBlockHeight); if (agent.getDelHeight() != -1L && agent.getDelHeight() <= startBlockHeight) { continue; } diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java index 7ba8f107a2..f872dd6394 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java @@ -89,7 +89,7 @@ public void validate(boolean isDownload, Chain chain, Block block) throws NulsEx throw new NulsException(ConsensusErrorCode.BLOCK_PUNISH_VALID_ERROR); } validResult = coinBaseValidate(block, currentRound, member, chain, blockHeaderHash); - if (!validResult) { + if ( !validResult) { if (roundValidResult.isValidResult()) { roundManager.rollBackRound(chain, currentRound.getIndex()); } @@ -166,11 +166,11 @@ private RoundValidResult roundValidate(boolean isDownload, Chain chain, BlockHea } // 验证打包人是否正确 MeetingMember member = currentRound.getMember(extendsData.getPackingIndexOfRound()); - if (!Arrays.equals(member.getAgent().getPackingAddress(), blockHeader.getPackingAddress(chain.getConfig().getChainId()))) { + if ( !Arrays.equals(member.getAgent().getPackingAddress(), blockHeader.getPackingAddress(chain.getConfig().getChainId()))) { chain.getLogger().error("block height " + blockHeader.getHeight() + " packager error! hash :" + blockHeaderHash); throw new NulsException(ConsensusErrorCode.BLOCK_ROUND_VALIDATE_ERROR); } - if (member.getPackEndTime() != blockHeader.getTime()) { + if ( member.getPackEndTime() != blockHeader.getTime()) { chain.getLogger().error("block height " + blockHeader.getHeight() + " time error! hash :" + blockHeaderHash); throw new NulsException(ConsensusErrorCode.BLOCK_ROUND_VALIDATE_ERROR); } @@ -434,4 +434,4 @@ private boolean coinDataValidate(Chain chain, Transaction tx) throws NulsExcepti } return true; } -} +} \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java index c1d8198f35..bd2bc01bd6 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java @@ -8,9 +8,11 @@ import io.nuls.base.data.Transaction; import io.nuls.base.signture.MultiSignTxSignature; import io.nuls.base.signture.P2PHKSignature; +import io.nuls.base.signture.TransactionSignature; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; +import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.model.ArraysTool; @@ -67,7 +69,7 @@ public class TxValidator { * @param tx 交易/transaction info * @return boolean */ - public boolean validateTx(Chain chain, Transaction tx) throws NulsException,IOException{ + public boolean validateTx(Chain chain, Transaction tx) throws NulsException, IOException { switch (tx.getType()) { case (TxType.REGISTER_AGENT): case (TxType.CONTRACT_CREATE_AGENT): @@ -81,11 +83,66 @@ public boolean validateTx(Chain chain, Transaction tx) throws NulsException,IOEx case (TxType.CANCEL_DEPOSIT): case (TxType.CONTRACT_CANCEL_DEPOSIT): return validateWithdraw(chain, tx); + case (TxType.DELAY_STOP_AGENT): + return validateDelayStopAgent(chain, tx); default: return false; } } + private boolean validateDelayStopAgent(Chain chain, Transaction tx) throws NulsException, IOException { + DelayStopAgent txData = new DelayStopAgent(); + txData.parse(tx.getTxData(), 0); + AgentPo agentPo = this.agentStorageService.get(txData.getAgentHash(), chain.getConfig().getChainId()); + if (null == agentPo || agentPo.getDelHeight() <= 1) { + chain.getLogger().warn("agent hash not right,{}", txData.getAgentHash().toHex()); + return false; + } + if (txData.getHeight() != agentPo.getDelHeight()) { + chain.getLogger().warn("agent delHeight not right,{}", txData.getAgentHash().toHex()); + return false; + } + Agent agent = null; + for (Agent a : chain.getAgentList()) { + if (a.getTxHash().equals(agentPo.getHash())) { + agent = a; + break; + } + } + + if (null == agent || agent.getDelHeight() <= 1) { + chain.getLogger().warn("Cache agent deleteHeight not right,{}", txData.getAgentHash().toHex()); + return false; + } + + //验证coindata共识相关性 + CoinData csCoinData = coinDataManager.getStopAgentCoinData(chain, agent, 1); + if (!ArraysTool.arrayEquals(csCoinData.serialize(), tx.getCoinData())) { + chain.getLogger().warn("Delay stop agent coindata not right,{}", txData.getAgentHash().toHex()); + return false; + } + //验证签名 + TransactionSignature signature = new TransactionSignature(); + signature.parse(tx.getTransactionSignature(), 0); + if (signature.getSignersCount() > 1) { + chain.getLogger().warn("Delay stop agent signature count not right,{}", txData.getAgentHash().toHex()); + return false; + } + P2PHKSignature sig = signature.getP2PHKSignatures().get(0); + if (!ECKey.verify(tx.getHash().getBytes(), sig.getSignData().getSignBytes(), sig.getPublicKey())) { + chain.getLogger().warn("Delay stop agent signature not right,{}", txData.getAgentHash().toHex()); + return false; + } + byte[] address = AddressTool.getAddress(sig.getPublicKey(), chain.getConfig().getChainId()); + String addr = AddressTool.getStringAddressByBytes(address); + List seedList = new ArrayList<>(Arrays.asList(chain.getConfig().getSeedNodes().split(","))); + if (!seedList.contains(addr)) { + chain.getLogger().warn("Delay stop agent tx must sended by a seed address,{}", txData.getAgentHash().toHex()); + return false; + } + return true; + } + /** * 创建节点交易验证 * Create node transaction validation @@ -117,7 +174,7 @@ private boolean validateCreateAgent(Chain chain, Transaction tx) throws NulsExce * @param tx 停止节点交易/stop agent transaction * @return boolean */ - private boolean validateStopAgent(Chain chain, Transaction tx) throws NulsException,IOException{ + private boolean validateStopAgent(Chain chain, Transaction tx) throws NulsException, IOException { if (tx.getTxData() == null) { throw new NulsException(ConsensusErrorCode.AGENT_NOT_EXIST); } @@ -167,19 +224,19 @@ private boolean validateDeposit(Chain chain, Transaction tx) throws NulsExceptio //验证手续费是否足够 try { int size = tx.serialize().length; - if(AddressTool.isMultiSignAddress(coinData.getFrom().get(0).getAddress())){ + if (AddressTool.isMultiSignAddress(coinData.getFrom().get(0).getAddress())) { MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); - transactionSignature.parse(tx.getTransactionSignature(),0); + transactionSignature.parse(tx.getTransactionSignature(), 0); size += transactionSignature.getM() * P2PHKSignature.SERIALIZE_LENGTH; size -= tx.getTransactionSignature().length; } BigInteger fee = TransactionFeeCalculator.getConsensusTxFee(size, chain.getConfig().getFeeUnit()); - if(fee.compareTo(consensusManager.getFee(coinData, chain.getConfig().getAgentChainId(), chain.getConfig().getAgentAssetId())) > 0){ + if (fee.compareTo(consensusManager.getFee(coinData, chain.getConfig().getAgentChainId(), chain.getConfig().getAgentAssetId())) > 0) { chain.getLogger().error("手续费不足！"); throw new NulsException(ConsensusErrorCode.FEE_NOT_ENOUGH); } - }catch (IOException e){ + } catch (IOException e) { chain.getLogger().error("数据序列化错误！"); throw new NulsException(ConsensusErrorCode.SERIALIZE_ERROR); } @@ -226,16 +283,16 @@ private boolean validateWithdraw(Chain chain, Transaction tx) throws NulsExcepti throw new NulsException(ConsensusErrorCode.DATA_ERROR); } //验证nonce值是否正确 - if(!ArraysTool.arrayEquals(CallMethodUtils.getNonce(cancelDeposit.getJoinTxHash().getBytes()), coinData.getFrom().get(0).getNonce())){ + if (!ArraysTool.arrayEquals(CallMethodUtils.getNonce(cancelDeposit.getJoinTxHash().getBytes()), coinData.getFrom().get(0).getNonce())) { throw new NulsException(ConsensusErrorCode.COIN_DATA_VALID_ERROR); } //退出委托金额是否正确 - if(depositPo.getDeposit().compareTo(coinData.getFrom().get(0).getAmount()) != 0 || coinData.getTo().get(0).getAmount().compareTo(BigInteger.ZERO) <= 0){ + if (depositPo.getDeposit().compareTo(coinData.getFrom().get(0).getAmount()) != 0 || coinData.getTo().get(0).getAmount().compareTo(BigInteger.ZERO) <= 0) { throw new NulsException(ConsensusErrorCode.DATA_ERROR); } - if(tx.getType() == TxType.CONTRACT_CANCEL_DEPOSIT && coinData.getTo().get(0).getAmount().compareTo(depositPo.getDeposit()) > 0){ + if (tx.getType() == TxType.CONTRACT_CANCEL_DEPOSIT && coinData.getTo().get(0).getAmount().compareTo(depositPo.getDeposit()) > 0) { throw new NulsException(ConsensusErrorCode.DATA_ERROR); - }else if(tx.getType() == TxType.CANCEL_DEPOSIT && coinData.getTo().get(0).getAmount().compareTo(depositPo.getDeposit()) >= 0){ + } else if (tx.getType() == TxType.CANCEL_DEPOSIT && coinData.getTo().get(0).getAmount().compareTo(depositPo.getDeposit()) >= 0) { throw new NulsException(ConsensusErrorCode.DATA_ERROR); } return true; @@ -281,18 +338,18 @@ private boolean createAgentBasicValid(Chain chain, Transaction tx, Agent agent) //验证手续费是否足够 try { int size = tx.serialize().length; - if(AddressTool.isMultiSignAddress(coinData.getFrom().get(0).getAddress())){ + if (AddressTool.isMultiSignAddress(coinData.getFrom().get(0).getAddress())) { MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); - transactionSignature.parse(tx.getTransactionSignature(),0); + transactionSignature.parse(tx.getTransactionSignature(), 0); size += transactionSignature.getM() * P2PHKSignature.SERIALIZE_LENGTH; size -= tx.getTransactionSignature().length; } BigInteger fee = TransactionFeeCalculator.getConsensusTxFee(size, chain.getConfig().getFeeUnit()); - if(fee.compareTo(consensusManager.getFee(coinData, chain.getConfig().getAgentChainId(), chain.getConfig().getAgentAssetId())) > 0){ + if (fee.compareTo(consensusManager.getFee(coinData, chain.getConfig().getAgentChainId(), chain.getConfig().getAgentAssetId())) > 0) { chain.getLogger().error("手续费不足！"); throw new NulsException(ConsensusErrorCode.FEE_NOT_ENOUGH); } - }catch (IOException e){ + } catch (IOException e) { chain.getLogger().error("数据序列化错误！"); throw new NulsException(ConsensusErrorCode.SERIALIZE_ERROR); } @@ -300,7 +357,7 @@ private boolean createAgentBasicValid(Chain chain, Transaction tx, Agent agent) Set addressSet = new HashSet<>(); int lockCount = 0; for (CoinTo coin : coinData.getTo()) { - if(coin.getAssetsChainId() != chain.getConfig().getAgentChainId() || coin.getAssetsId() != chain.getConfig().getAgentAssetId()){ + if (coin.getAssetsChainId() != chain.getConfig().getAgentChainId() || coin.getAssetsId() != chain.getConfig().getAgentAssetId()) { chain.getLogger().error("锁定资产不合法"); throw new NulsException(ConsensusErrorCode.TX_DATA_VALIDATION_ERROR); } @@ -379,7 +436,7 @@ private boolean createAgentAddrValid(Chain chain, Transaction tx, Agent agent) t * @param coinData 交易的CoinData/coinData * @return boolean */ - private boolean stopAgentCoinDataValid(Chain chain, Transaction tx, AgentPo agentPo, StopAgent stopAgent, CoinData coinData) throws NulsException,IOException{ + private boolean stopAgentCoinDataValid(Chain chain, Transaction tx, AgentPo agentPo, StopAgent stopAgent, CoinData coinData) throws NulsException, IOException { Agent agent = agentManager.poToAgent(agentPo); CoinData localCoinData = coinDataManager.getStopAgentCoinData(chain, agent, coinData.getTo().get(0).getLockTime()); //coinData和localCoinData排序 @@ -390,14 +447,14 @@ private boolean stopAgentCoinDataValid(Chain chain, Transaction tx, AgentPo agen localCoinData.getFrom().sort(fromComparator); localCoinData.getTo().sort(toComparator); CoinTo last = localCoinData.getTo().get(localCoinData.getTo().size() - 1); - if(tx.getType() == TxType.STOP_AGENT){ + if (tx.getType() == TxType.STOP_AGENT) { int size = tx.size(); - if(!AddressTool.isMultiSignAddress(agentPo.getAgentAddress())){ + if (!AddressTool.isMultiSignAddress(agentPo.getAgentAddress())) { size += P2PHKSignature.SERIALIZE_LENGTH; - }else{ + } else { MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); - transactionSignature.parse(tx.getTransactionSignature(),0); - size += transactionSignature.getM() * P2PHKSignature.SERIALIZE_LENGTH; + transactionSignature.parse(tx.getTransactionSignature(), 0); + size += transactionSignature.getM() * P2PHKSignature.SERIALIZE_LENGTH; } size -= tx.getTransactionSignature().length; BigInteger fee = TransactionFeeCalculator.getNormalTxFee(size); @@ -445,7 +502,7 @@ private boolean createDepositInfoValid(Chain chain, Deposit deposit) throws Nuls * @param coinData 交易的CoinData/CoinData * @return boolean */ - private boolean isDepositOk(BigInteger deposit, CoinData coinData) throws NulsException{ + private boolean isDepositOk(BigInteger deposit, CoinData coinData) throws NulsException { if (coinData == null || coinData.getTo().size() == 0) { throw new NulsException(ConsensusErrorCode.COIN_DATA_VALID_ERROR); } @@ -516,20 +573,20 @@ public List getDepositListByAgent(Chain chain, NulsHash agentHash) th * 获取区块交易列表中，红牌交易或停止节点交易对应的节点Hash列表 * Get the node Hash list corresponding to the block transaction list, the red card transaction or the stop node transaction * - * @param redPunishTxs 红牌交易/Red card penalty node address - * @param stopAgentTxs 停止节点交易列表/Stop Node Trading List - * @param chain chain info + * @param redPunishTxs 红牌交易/Red card penalty node address + * @param stopAgentTxs 停止节点交易列表/Stop Node Trading List + * @param chain chain info */ - public Set getInvalidAgentHash(List redPunishTxs, List contractStopAgentTxs, List stopAgentTxs, Chain chain){ + public Set getInvalidAgentHash(List redPunishTxs, List contractStopAgentTxs, List stopAgentTxs, Chain chain) { Set redPunishAddressSet = new HashSet<>(); - if(redPunishTxs != null && redPunishTxs.size() >0){ - for (Transaction redPunishTx:redPunishTxs) { + if (redPunishTxs != null && redPunishTxs.size() > 0) { + for (Transaction redPunishTx : redPunishTxs) { RedPunishData redPunishData = new RedPunishData(); try { redPunishData.parse(redPunishTx.getTxData(), 0); String addressHex = HexUtil.encode(redPunishData.getAddress()); redPunishAddressSet.add(addressHex); - }catch (NulsException e){ + } catch (NulsException e) { chain.getLogger().error(e); } } @@ -565,7 +622,7 @@ public Set getInvalidAgentHash(List redPunishTxs, List list = RocksDBService.valueList("consensus_agent1"); + Map map = new HashMap<>(); + for (byte[] arr : list) { + AgentPo po = new AgentPo(); + po.parse(arr, 0); + map.put(po.getHash().toHex(), po.getDelHeight()); + } + System.out.println(JSONUtils.obj2json(map)); + } + + public static void mai2n(String[] args) throws IOException, NulsException { + Map map = JSONUtils.json2map("{\"39a23232daf07c454b35334d780ea62e4921f913b5957b09ea9a0439c7afbeb4\":8084054,\"476fc57f878b87d46fad60ffbb0a65fb13fe5b8cffee552eafcd93f000598417\":4577154,\"0bc2090273f9afddcbe842c19ae33d94bfbae911801d7f6d6181bbf806eca895\":8083944,\"7756e4bdef3a6e8ba25b62ad89221f427e595bf8eaa487ca2239ea09aecede6f\":5201198,\"3a822becde6ce8717994f642a68ef7e8f8a03cd367388f1695974e596e50c731\":-1,\"5777788b23636972ff7a97ebe459203d793936f44a5e13b9ab875b61499e260b\":11415,\"b1716a2798e8386e3f0129b0dad13ce750cc3592fa499e2baa8832985d5b94c2\":3286416,\"27d38bfc8dcf334a0585954ff0c392f51aaa33c22fd406e87ec872783c04fa46\":242357,\"8a32c0680ca654fde91d6019c2b50e44d43ecee9cb695c7fb29dd226b1941069\":-1,\"7b31d8917ecacde46b9cf9240d2fd519e3ca32f6f6780893b5e360f2ddf3d006\":1124836,\"74fc0451b1acd01e1e659887f0c87bf710fce5ca48a757f26dc5acd5326df274\":3303203,\"2ded4339a4fe30fe850288c88b5513d22c20d39838c07b2ae4eaae30a78e5c48\":-1,\"de909bf3550982b5b2a38f1d53c672904f49f9c5fd062c73b3ff7fef566b9e1f\":4683765,\"7d4e00de34691967f86217949da8d32ef6df872894149b792d10df3b29121b03\":2740119,\"ef4ec040a5a8ee4cc7ccbd0fe74a06d037c0689f7899441835cd5d0e752b26c7\":2922041,\"651601e9afa22596c45d2d65da30c48978526b89c845951c8bfd14e9ac59bf16\":9635,\"ee11a0f2a2f79a798087272a55878bca28cefa590303ee56c62e59536ce14570\":3686256,\"65a645787cc9f9b1e3300701959456a3b698240c780cd4a15dd2f33f699b8787\":3286413,\"71da6961070df067726dccdc2673d5da95b550f3d220ba9da0fefb0d74d68cfb\":-1,\"c19867200e3c00bdcd915f61c95ca9189930858f0ee05ea619425bd2dd3fbdc8\":2758586,\"2b1751d56964794fc7585b598cc35eeb5c4a9dda17d0827e309f7d9b0afe9f46\":-1,\"dc3d3248fe8d5ddeadd145e1a71566be2d4da0f48168da5de4194abd2158e9f3\":3530151,\"182bb5675bc3aed268e99f81d7ede9323d2acce347137a5ba37ce0586abfca82\":5027461,\"697643b571bea4e51dd7fa562ce0d86121c7af4181501e961f0dbc7a97af6216\":8083963,\"85e30d81eab45f5cc382e7037c1d4eaa60d64ac228de752dd0ea8ec45443014e\":-1,\"2a46b67555c815307369416c8821f0359cfbb6aa255344ceac4eb072a1a2a12f\":-1,\"bafa1c2fb34f31edaed167a197057cd474d0831362680023d9cb8a2f126465e0\":6047420,\"0d9b4d21d6a2aa5dfb3695f71a275916be5674b1398a487f10fab0c976baf90d\":3751982,\"b96b689db12ae1976be4ed83f5e78fbb75bdbd5ccb1853c2baf31cf119228ac3\":5206441,\"737ff49165ed899693247fcd9a5d157073d7fb48fca27641eb01a60b17a680c2\":6833125,\"89f89723e9293e39a0b00f14e9fbe8059223b2553eba303ead67394dc5272dc7\":1751368,\"230cac7e0871c20b51f011e5a2b1ba96607d849c5395a7beb47f806b8c4f4f05\":8083949,\"5afde946b6977a4d9b168913530b48dd3df65b640f3441af6b1247b53fc43138\":2542550,\"dd2da63f45b1a4119e0eccac2d7e756e1dc86551b8238edc5069960bf682fc7c\":6906192,\"423735d1451bcab64122b3145d969c334f78ddec9be4db2e2e3abffb413f8c3e\":-1,\"1df5e3b966fc192613682cb493f5938d710dff9096df4e376f544723606d7782\":4031677,\"5820c4e21dcf018751e2b28b223a980a08906c1ead6edb9c02f003fbe3af4ae8\":2154418,\"aed3ab57cd571ecd93deece1fde39fef50bf37670e7e6b566846379ba25c075e\":-1,\"ab00e76ba14fdc1e14dc1a3c7d86e9751de81fa0dfa98c98b5f236f6638a3cc0\":-1,\"bf1d130b307f9fc1e50177f5111699bfbe5854a58980043502dd66872f1f5ad5\":3693340,\"f3eb83dcd184fe80c7e57adf63c329957f9289f90154df437c54ec2c99521305\":-1,\"389d4a4a9d16dfd3b8a4608f87a9db552da37c18def18b0353d3326f5fc222bb\":-1,\"4df16d1272ab18f3de446af40b6e0da862c608053aa2bcbd35833923645bde4d\":2307906,\"5c5e8a8b24f9ee90a6b9c74a7a64ce50c1f3813998fc474f6d908907b762662c\":358925,\"499d3e9eede759921e30ff4d74ae6ed72cbbb634180a3db7ca4e25eb2b554f9e\":5014272,\"4470d7793ae11dc58336ea5cc69fa2a28c26387b8d234d74a92c0ad81735cd96\":4277142,\"9b684aa73433c26fb9d374ecf1280b472e9b2a52ee34905d7a93965db7b0eb8c\":4251025,\"a92ac22f4e3686a594be6558f46400d889b3832fe776fbf5e705307005fa865a\":-1,\"ab312a0abb74def8cd15dd4409744a50be610fe294ca6a819aa200d577d9644b\":3726969,\"bb997bf54560bb384f2c25a48865ce3b88c8ad5b7f3775a2110cbefcec83e2a9\":2910708,\"e352b3cbdf4b94c34b3ef57a1ea8df14091f1756a23465527220aa6fc8ce96b6\":6019726,\"6460d634470a62b9b50f3d0e4c7df396c40de82a9fd4de94449101dff586bf39\":7079825,\"e3e98fd2691a70da3ee618d0e237f36311c38842c256584bd26bf667700f978b\":-1,\"e8e7d91dbd0b55c443c38daa7901c1669f1a5f062daabc9f50b9fc1ffb9e52ef\":-1,\"24b63ec9edfe2692bf7ef2751bd6254db63768bdca50d6ac45303db70617d5ba\":7607455,\"45f5c09a6996f7b023ade1068ee4738a6c65ea50465acb39269ef4cb0f775c09\":8083983,\"ddf286f84d4eb4f21371f22690cb75262a4dcc95e63b29da2a122a754e7418a1\":138153,\"e14c5e133d078ea1790ec34bd5e1e6f701fe8ffe63270b7c01a2f8e64e21a9ec\":2707844,\"f7c45a43e6072aa6ae6256d0af51b16ff4e9a4e55d697072acf176065ae2a9e3\":-1,\"e904d2358ad6fa4491ca8ed7931a359808c0502f2533bed7ccec21ac98e0cb37\":-1,\"6456420f69dc3c6a5eb793a7cf6caa6eea35b537e3be6db5bc562aa6d867eee7\":7382765,\"50de31126d3e977418fee36d9547444546fe2c4b6e2075544a71b5c2d8ff89f6\":-1,\"d28cd0b20444d405c5583314b3a9f46a94e93e0dcfaa7cabc603edca86daea0f\":232708,\"0ab7d185d9290eae37f463f20f759a0eb45424280ee6a292fd98d7101389ffa9\":2337899,\"45b15a29bb0fa049820326102f6563f9bf2f353c2b2b1253a4b14373acc95737\":-1,\"806536cc2e99b2bcaf47fe7cb812571bbbd47e8097af4f772a18abe1390babaa\":4030805,\"66745819ba3667e213e27443d1ae785d77d2f3c451f707bd0d10d827e7cf89af\":3750593,\"e2fac4d4ee30fde1facf9605dcf4d0072c5add8522da4519161d0637d65d3d36\":-1,\"84c4bcecf53c807e938b2b672e6b799796d6e3b017b4fcc06c37f7a1123fa5c1\":4921059,\"a7fffcc3c8412eff43082893122c2f7fb50b7d52e5f37b2497acf4a22bfab86f\":-1,\"3761abd4c897075f758a65da1248f549d84d7b0a158e4e4544b166c8f6af650c\":3000988,\"722bf755561d59cee0f074055b5ec3b155d14ce6e3a559aba3dd58a6943fb7cf\":3491726,\"5afbc8ef324d08f1ace180598b9195cddd8d8f21d8131cbd44b2d84d6b3f1719\":833850,\"a80711019c063fade7b34f350d807c9d2fe2a86b24b6d3804974634ad06f31a6\":4899375,\"c68abc1e32ac1b1ac8f2ac75d2885ea930facf0870308d8bf6929780b654f8ee\":5757861,\"f2d134a3d99055aec36f94d2bcc49b340404acf4c0c16e519f8744d27e842f5b\":3743417,\"0109715a4fd74645a871d3bcc79e4ee4070faca507959efd184c83c1c8190cd8\":8083980,\"80e7528eb225a100b02f567475f5db36cb50517cc9d24d1cfee2ced211ece406\":950554,\"8e90a51095abfb05e4f088b184c70691617f8c6bc8a852fe00d0101426f5ab4b\":4912010,\"cff90341d82543590ea6242034fe2c6421c2a4f550db58afc87b96759a1af1ee\":-1,\"12f538dc9085d2b0c179d981549a467a031c660a88d194a4e2c3a8f38a6ade63\":-1,\"37ec466bb50387af6ac6bd9b534885e3b6c660a85d89ff8c8e6ddf111cbaf1a2\":7828986,\"c14de594385985ecdaa8bf8da44f925dabc5de3274c5126a1e50ea3ec2c69e4a\":7829056,\"8416e19bc06192cd3863bd7650e77f623986aca8b054f325224a3874373734a0\":4656749,\"b4771439ab61be1db4d3f3d816cc4f9ac46f498488e3b74ada31f3ceefc12d92\":-1,\"7100b3693de66994278fd1b324fd09e8a513678019b9280c46a88b9a26c5f18b\":2037153,\"7e1af5f0843255cd23188bd005a9068355fd5f721bb498585b62c81b86090f3a\":9639,\"085403196c5d3fdf959ffb17d4042a7721e5c05ed957cff7163b26a7de7c2a97\":4632865,\"67d2acadc7173c9be0a9f80fc1226cc5611530a54191359c89b6fff67191d46e\":-1,\"2253df7489ce2ef90a9ab5f3e06e03775e0f88d6606d756ac8a9ab7133d27020\":2877511,\"64c27f054fc325cf6f3f23bc52d0a8e943823b32d1bf095d46d0946c42c754ac\":2975486,\"8e41e049421369f51e9c6333d044e9d5960db055b7d1798b793da1b55c29d908\":6769080,\"a3ff9ad35b8557d5f5fa4502ee86468c6d67bc62fbaf3a77b059689debe7a71a\":3695712,\"10cd696e61a31d46cbb6013f40f4bf4621ba44d11dc528df2e771ef13a151657\":5201206,\"fa00a2b3b6acec574960143347bf0cf4ab3b459ab64439ba8c765a1ced466c9b\":-1,\"83555a220da4eb3c6b16eb9c48f1947c53a1924026c10f334d291df645d78fae\":3433044,\"183ec98482b8bd9fe728d3bdbad3d3179d12cb75469b3468bad08779475fad6d\":4656757,\"4043ffbb81249888d4f4c9fab94a800790143b9637c9ef1ae9e13878751ca7df\":34861,\"c9f3151f1709a3470f0471906dfad096ccad10f40e19e144b8a5f0d9238bb621\":-1,\"069bfec5931d89a859747b53c6e8bc877f95b406f083921dc219ed6af2be25f2\":8086320,\"ec995ce3eba9fb40fafc7665e916cf2c56f5984aeff4fc2af60663a68f61c5e8\":5623181,\"350078169f08b3324f0e6c01ad2ed499b05d25924a5616790b811dd076566bf6\":3530156,\"88312d4978083d5649d9ed498d820d164ad51888148b9afe13b3eb7a17a70bff\":-1,\"528a630b43f5d1eeea5b4567e87c7f7f3d4b86046b8a3d079ef0b9a1aea64360\":7865610,\"e75b9bfe6f8e6e6d9eba53a35870d281e0c0ef305de5e20bd4b24da8a6960e03\":4837208,\"09d583ea6d26b8c41f0f023fbfdd3b438948f6db499fdd27edefc6db1b41f09c\":7847259,\"d11d29e38b3db75aec0ebb69dc66eb4f6276d0a1d9c7faa6a4fa33b699637447\":8084009,\"00083bd80ba724fa48bf96a6a2f8ca9798a825d65fd5ee1e738915e5d4ec605d\":700634,\"54b0cf55b3094ebc9d657694b691c9fa3e40090e9c26c98df60bee3b3ff3e32f\":749996,\"ab5b6efb0828ca75fbf77401a42163385cbfff0a415bf914c02bb8b647f4fd08\":2898515,\"ba23747f7a7787946c072260abe0d67d0d4d8bdb357041f64134e16542968b5c\":6923768,\"13f47469cf168f2882460ad69bf200e3ec6bb559c0581a335c5dfd0479795330\":7341895,\"3d5e3c172a95af0afe8bea7b1073c7c0ba7a175b2ef27496e68bf7c9095230a9\":-1,\"650c4d1e71201de962a0d1a5ed970111e1aaca6799744f851f56abe9a2344795\":2623488,\"9a051b9780ee57a0e6895ea87adb4df3129c0542eb81e6a575659a061622fc68\":4177120,\"b3006daa6d1b3300efaf143ca6e9ce049b5ee29a63ba1b40071045b152164733\":5874048,\"3d12e3912d9a98dba007ba1c94b4e214db5598c0bc64ccfc72817c2674d13cec\":292904,\"04fd63142d06e479081b4a1ef52140a35b81e22ac7d9bf33c853917d1c39fc76\":3493325,\"9f6f046eb495ce65626f2ae6598e9b92db8d855bc59e09da384bac6571ca97ac\":13066,\"9f1dabb4d4364c74fc13ee2a6765c8d9de72610bee7b42cf57e619714fc0d420\":624734,\"0f93accc9467da57f95f306f40008900506bbe97776e20a181051b9f3f061f6b\":4685300,\"75b4c5f64e26a281b40cf03a8a20faa1d9fe49a08429c087e48fadd3907f77fc\":5337,\"8f5b371f0bd4b2bd362495d9e187578c13aaddf131348381a4653b7aff9c40ac\":-1,\"bbe0e239f698dbd7f310d5ed33701349220d8f1549316a1981436d19658c99ac\":1786654,\"93fd741cdf0d7467e225647e33a6eceb07cf1a533426c10569446d0ed1c4f27a\":7793857,\"e95847cddb7ece78cbd053104f54f01b369c0f1d6b9c68524a4ae09ae786e4e5\":3760733,\"bea91e9a3a9936935ffc30154c3f68da6f503ffa056e0c8f81d07fdaba9e0bb5\":3501596,\"58ee8a6af121f183d496b720812e116fae23856e942c48c1308d13302603b1f6\":541095,\"c2f46534b09b8ca5cb821d6fc67662f51eaecd3f697fea18ddb6f432bd64b368\":3721499,\"2eea13501505921c21e7080d4bc3a3edd818e2bda954c38321ba122c1a405681\":72767,\"cb2a1e44981be7aa5da8779429fdf3f9195919c8ecc429d3a21cdd76a9753748\":5072071,\"d327dd4196a7757b3cfa0d1572588f9ef78e5faa803e8d2e374d9e0b12292272\":4321174,\"9480f17720ecf3ca0297f8ce1da760248a9769e06de27862b7a7528aa9266001\":833852,\"abd09e8c695349a5fa900dd4b0b87bb7e0abee39f484583adabf441d875ea925\":-1,\"b5f5a672854adb8740410b8478ee49b0b0d163f10ecbccd5a38331a9c05be6c5\":3343275,\"b0b89c60d52fc60f28d15bd180d7f573c6127e52b3a7e71643b5723928e6b06d\":2351228,\"3cf82ba4edfba839006e7c126d1448ba6ddc422d623eb4f965b1b7e597f3ef52\":3241577,\"b9762a525810508af79c353dc8e98ea4f578fba03e560cf39280919f31b7f5b5\":3095744,\"6661f2852dcbf982180420bb5d5981f82d79f0c3f8bef3f4c08c526724aa6c29\":-1,\"5449783c44da63ec15158f855bded1b68de5685a7c0b8a3c664ac3701d2487f5\":7793880,\"704854d076decc8648b3842951761a1887ee87e28a21c42cc2f6589cce95aa86\":-1,\"b5d5c97138c3a7243f7f7a61b78d3a6efdd538f937ba499fe69cf16075fb91df\":749949,\"02c8cd22705ec00d18d563faaf389db174f93f72485af4f91a4227933161e3b3\":-1,\"f0a1918e40b85766da7a8685d6c943bbb70640161e860fef238d4353b1947c70\":833745,\"ff9b4f41c4f42585b4dbb356d411e460b47f2cd06694adf3e951ae1470df8aa7\":7865676,\"475cffbfdb7fe5a8f6ab210eec5af321a42c824541685cd2e37d8e8cecb3f067\":-1,\"48b165ea23f068e0768f77755db2a9923195007e45a9a52459a197d0be50cd35\":-1,\"6a76a09fc72afe55b17497bd10d62c848fcdd2e3de7e618ca8cde8cb1376d268\":4753269,\"bf1037df242bf024d84e85c5a5091583311ce4273d933226aa471bb1e46ded61\":4880516,\"9b02c1082270a74f8f45bd2a067ff584e4d65da6f13135b4190d6e9153c85727\":2707848,\"86ece135979040050022f64ceb7b8a1c81438828f8ce74432f3c597a3d93eedd\":-1,\"8a13314b1029147355517daf8a634010a8b1aac4f8deec095dc166674698b594\":833658,\"3ac8fefbe06e17c11109b13a7bba91b6f4baf9700343a56f7eeb9dcb76456c1e\":7793886,\"4d0c277bbc654d4f518f918678cdd7bd67538709236d45a913b36c1f79469578\":7192325,\"a392e9b7628d4d5368c2c8ec7db2243de7afbb4def2fdaea2bfaa2a8f056bcae\":-1,\"3b5057a020cfff8d4befbe3e7e285f64474ecc877076d0f84df9c30aa2ad8e39\":833785,\"5605cc6a4f0d9d967352da9a34cfc4c2f7e00f640d123bdc8f5ab37374db9ad2\":913939,\"693c2a5348380e164a0c7cc922e0355c688d649de73bd8f752a15efca564f29d\":5101962,\"cfd3a2ab55b9600228ec9e8da00dfbde47d683abf5cc150a930d868b10cf0935\":5425120,\"16b1492330cce90433014e2fb2c0f75d60032227d2184c040902ccd5b330603c\":4155658,\"7e334e32f3ec4a9e6aeb3811cc4ae0cfcdd40300063ef879a380656aff2b72d4\":3726054,\"9de5d3648192966df236a3f0ea71bd62a01e2be9f4b0763be4fbd47e9f4abb09\":2898512,\"9e2a731ed92c311b5252ee54fb080b4f71b23944a8579b62d7526791739e362b\":833804,\"523c0736e86f150f060453dd70bc110c6ddf7ac1624c422c0d6ea431d98fb7b2\":5072297,\"a6fa1113c2ca4165f2a7d91d7cf8c140fd461fb5ac74d1b07ea25f2d56661578\":2770664,\"b8c271c63485172a8133274a958e87dd348e5d7027041ec3db3cc1cf103e5c14\":-1,\"d17f77b737cb3ebfb9c50c97263cc2b6040cc94199d5a3269cb2b08a4f3e8ce7\":-1,\"8b5984fe53024872ba05403842da03b5c881c2ec401fd1b6a5309241a303b4be\":2895056,\"836d1b70be6d036bea93e213b6e101eeacde05560238720fb2826113119b4ee0\":5358094,\"cc1b60c282d297f4431c283bc88615f8d70f81e065405d0d8448190620032a91\":8084063,\"c97e8dec7cb4a3cca5268dae34b63007cfc918f80fa8ee4d8841ceaaf8eb61ac\":8083924,\"031e2aaf0fadf9e3ed9d207acc4181cd575f9be9d78c99ad65da15abc2ca1196\":3290738,\"bc46eee9ef2a29156d45da5f6d20afc6b4553f95364b8f45af97eab273c5a441\":1808690,\"46c5fe249c84f50286c6636b5bc089626eb9906e68ffc5c53ee2f168eea86b65\":-1,\"90dd89b68c85cffa62284277f1c76d64dc50301509a36be6fc103f3688d227e1\":3329414,\"953404b032e8940f7c0f50e4c5e459fe1bd9fc5d2d5c8e7dc49830c2ea38928c\":8083978,\"165ce741856789b91551a734efb687e48a6d796f98692bef78c7c9cfcdf42593\":2287167,\"429c66d36c448bcfb48fb37c5025879d2f221c34e9ad8396be3d389eac4e8bd5\":4336772,\"ad41a5c39e2b5d68e0fe6a4a94adae88d0dfc8100c91394fe4e67182a4664b44\":8084046,\"3e729a0c67cdca578a561f81f3bba9330e30164eac10a1e397839a370a2a2d73\":-1,\"fe0ef332bbdb4fc831d46d1c1b53b18803851d99c7d9af9206add5dcb34f9d33\":4598844,\"816c175d76ae953d1838ad108bded206381fae97818c8a0a26265f29e707e7e6\":5072077,\"540e58834a45c29d64762a381b25f8645755234084cf955f32aea820025eeea0\":-1,\"9dcf66d03b0d977b8f1675b148c198dcb95c11635aa62990ab49f770add990e8\":1991747,\"ea853402147ddb5ac81b83d30859ed651015681949a37784531526e377dcf802\":8083957,\"078a5ba8dcc87da4ef7fec7487be131e8804a9c05204d82d37c57458f13b3879\":3684095,\"6774b068fe17cf99fec1a027b97fa151b0a74b4254fb27701bdf158d7a890e9f\":7346300,\"b82b107e9220890e2338ec8565b12a422f8470fc38cbada8092fcee323ae85a7\":-1,\"75e5a689734cefc7ec9cbd41d9ee4bfe904565f1c697bb29157131fb746e4f6f\":14018,\"2206c926cf51f2f66bd5839a99288283582e6e7ea4b38d9af76be76e254fec38\":2922324,\"1f36c575a572373e87d0ace7e441423d92967336cf0e44b81e371672ba195f12\":5907,\"8153abd0f5a7057aebc71b7342acf0ba3b98f245a6e0a59eaca167c6c3282db8\":478792,\"3b0c266dced326279da4817c081e48b86257502a369851cfe305b862f2d798af\":8083923,\"80529a04fae3a91bdb45bd4a81af0991d7ac177c4ac41721ee57a6668ed6f2d8\":750030,\"9cd8230cced260bffe4753edfb0fc5752bc8d5258f1cc04885ce6bed8277af83\":288563,\"e46239361f3b4e95ee96b7990b0ed7be555aecb188ff1236d4262d60c8f85d81\":2040491,\"325ac3cd5c008dca3bd2c52652dfef56f7cf3c51c135b40642b9395bcc10923a\":3816442,\"937d72fa7adbfdc221de959b6037052b9515f53e5d7e8eb5d1784597f5cb5f61\":8083973,\"0a8d1ddf603156f31d47a32361e0eebb5b45f5a70b12676e5715e98555426a70\":-1,\"7e082ec143e76a0b3030e3a651a3fd9c37c86219e84d3c6b48c2edf6ca4e02ac\":1921943,\"1976212fa81e2c03a2931efbb8469dd34b1ee1a131ece59db7680dbf63d90a40\":-1,\"64e56f2df275dcde241d0fbe5fbb106ab31aeaf96a794298272e8987d12cab6c\":2604497,\"82ce0fa60a863dfe7a54fa6ac45a973e4a877a3ac511cfcb70c5f46c829e43a0\":3508276,\"0c626e71b323e7304aa53b8fe20a70eba715e4189b2ce14a7170fc3e0c896495\":7828978,\"01d11fd5da7e68ce8b6b67ea5b8076c1e45d9674f73e6fbe2f5efcef3b10ac94\":3252118,\"b9ae30b06d19d1740ac734c5284cb4a8eee6d2d0684684a0af234c03cff6e6bc\":3242524,\"7e0c09bb9f4d96d60cf57f8b341e4a7eed40ad58a301da050595e9ce40d7edf5\":5542111,\"f5f45c27d3a2a01e5cb13c3d1139229b370a5fc801c9dcf5fbbc683c8e4949cb\":7828988,\"4944f655255a3524cf9fc4c1171633ce00f0ca7e08fb50c2df5b92fecf744484\":-1,\"9823704c52511aa96bc73cf470c0e232521b3360f10edb4c504ca4ac59aff7b7\":339510,\"35070de808e9500a9f8c5b13dc1e390552f8ba70d17fc774b9836adaaab1363f\":4055460,\"d3a29a431fbfb348c006253651f403dbce53715a35422ed639ae6778ed5f1cf0\":1751107,\"c4b71f7b8f967c61382c042ee7fbfb7394ef1f1f23d5ee7982ba876306026e05\":8083940,\"360d72af0f8df855042b57ba3ce260cc5a81b73adc367b3dc51009f8841b8201\":3795189,\"82ae05d3ad400267ba3f3fb6c4ccc9a8c407a561cd641e7316ae5cd3fa2d3062\":4440196,\"c2b3a1e74741e3ca9d13c953d124758f567645ccc8513bd407aea4ecacfd3989\":5316396,\"2e5cb2b2fc3acce78f1d6d71ae1b18f4b58bf153bc3cc537b7fdd3667fd369be\":3688267,\"ad2ad7bc2f5f002bf58a607f1ba3cb4cbb951d1df9a882ad9b68d76618838e7d\":2676765,\"7ff79459681f2afee3b4ac7daf4c22874d9cc888a34d7017a4cc7a6e337c6e84\":3227624,\"9f4c39055039444e7f634e44499f970f320132cfe9605e09309988ac2fc28094\":2776670,\"63715c2f1a083de2525cfde965ed2fb29c4e7426420fb0bc0971a713f44249c6\":3109141,\"6f072b5be4ad3a48636d9c0fa9e2d7b1eedefc8db626abebd90fe2d0a26e7435\":22111,\"3148b573cfdc5e815b9d33932d362ace48367f7cd7195cd10f3c0ef7b77ffbcc\":1605455,\"6cb5d9f8b0c5026d6682a68c52fbb9fc32e548432afcc26239ac30cfe0e21b59\":-1,\"e206f77ef92a6e98f3a292206e5e4f94c45e13c8f5fb0576bbbd4d3f82fc2477\":3462654,\"a27170a4ad246758cc7fb45ded14b065f6a1919836a2bba34e6dcd9335a054da\":8083986,\"a88e9aed8df0b6dcf02ce1b5c1432ea516933adf4bc7e0ef83a8680e39543d6e\":-1,\"613585d1e41897e2c6b979b643cfdaccae88827c17ce50a45f74bcebef18924f\":3795206,\"e970696bbd7e5e8efa19d3740a2a3eece1e884eaaf7ac76140506d111283e41a\":2895957,\"62a2e1272ba756395d89a5d36eed66c2a0c32ed4a17a00819c73a02417a93b00\":3730061,\"ef0328719d32241fd94d4f2f0da9d3b15b03162127532262c1efd67282e60408\":2137965,\"fe882bab3ee2ab8a615cb83bf849d6c5f4417f12311d0929cb5e86b9c07c133d\":2899027,\"a664028121c815e04c8683f05453e623fae96027d202ff9d59a9cc16d6456faf\":4656752,\"aec481569c30c27158b4b7b26f3b66581ae176f1f31947048d27993a31ab29d1\":1808871,\"b86c3d5db9c89c3cd69ea6c033c60e09e6610a50612f8275d3e011c44865426b\":2683650,\"db09019795bf3303483a39fb3a2e096bc1da58e260dbef160377a4841386e548\":-1,\"04f0967af6f7b812e8a079120e68e7cb50437bb9bfdf82cdf25149ed13580a48\":441549,\"82f076999d44d564dcb2b1d401c4743c949d71d3bf13f0e316af52f2c1f990b2\":-1,\"4633c3d532678821d904b39c9273f723ce39593601c912fdca3e4e74f1bffe05\":3286410,\"9b00ce6acb8e3fc94857c3d99f9dc522d41014ab6c863fcd2b1c5bfea18cd4b7\":5072296,\"4545f4368678fd74f5ae0c9b994ba99a63cf75c5c2797131a54d422ea44a6e0e\":7573222,\"08c30061df62af735b4f0ff878dedc731bf14decff71849fa02ab70ce7595620\":-1,\"d525ba3f345f69bff3307e4ffae678c2e5d02793c87108c4336067f241256909\":700751,\"d8fa932d9b68e4ff75d340d5fc755314031f401b16d6f6bdece558fbc21ab6f4\":78457,\"9c112f4d8ccd5cb3b881e34f98b78a06026aef143f10b57c6884f0654cc08337\":3501606,\"bb04d4cf3c4d718587d65cb10396863a1d652b939b24ca0eea916d16054c55b0\":-1,\"42bc5c175add6ab7bd8e4466df540cfa91b6c4c971f4bdb47e2be600832d80b7\":978303,\"54d94802bc8c25ff881e89de9ef8e0b01cabdc48be66a1299a628b9693049797\":-1,\"3ec06de92c074e4bf59a852f93ccce65bee8e80ff4c17a09d083254c0067f38a\":1432663,\"a4854eb4c80f85c72bdc86ecf7e2d1696b43ad270e9fe4e839d3397674586c94\":8083932,\"f2b6ce1712a917778fb23cbc4a3cc1aafd047a1500f35c0c5ca5b5632e6ec1bb\":7828984,\"b4cc30c0684e546ad765c6dc52be978353b627842311b14f115aac0cecf92b20\":-1,\"71d2c5bc0e72ee79a6f0b8f398b593f33959a97f376a170c316235b50aaeda89\":7484497,\"d3b4db323aacf968a65c72edcb1453cdfb3044b645d953c6bfe2030d86c8b4a6\":4249597,\"a87c1d508f92e6eb6cf698392f75f24a34c70efd319fd09968f520e101af62ed\":3295789,\"eef27d0d22fd412a5057ec9d063020cd4b2a53f1d97285b358243fc07b398e6d\":833711,\"f65a244ae69ef8930e0cf0ce105a287da0b611a360247753c5154a92a4c00494\":1388210,\"72efeb310c0186f792c98a04d7f05856068a91f8c94e4949978d9059dab29b20\":49677,\"54b0d4b87f6150a221004d46becb2ffbdce26678848741c5e991efebbea575c1\":833846,\"2cd33e37c1ccceb7dfe1f9c420b6082292ad32fbc5e9b3a57bb4c8125330912c\":4851930,\"ab469f45ab7b05c608a00f5c267c5fed1d774a3af91408cf2679242d13cb9c04\":2355005,\"d65a408e3a822cfe1c6ec3738d51fe2c480d65c2e786f8de71b49c87e108e645\":5529473,\"68a22e0cd8b72dbfed95e5208d6c09f64e1a187504007ae5aaf16eb3bef377b9\":3245662,\"0a30002ca3f516bdad9063d9a6612ce96f545a0125fa925a1b0d1c43a5ef48ac\":-1,\"ac5ddd1f6d9277c6e3aa4eb7c43ba6e39758aea25b7e172816ea65fae1102559\":2896167,\"a17ecf014e43fd70a0be61f903f2d13178bc18e0f8f5f3aab89dc0e74527543b\":7484963,\"03cf80620300eb5942e2c8458f541bfb90ae383e2c180235249f88aa0165ca4f\":7865559,\"476d63ca6ab86e564e3ecc1187ecd22df3ef17ae64b84a59360e59421b9e756a\":1046344,\"49b2d771708c0f19896f3d99f8a5a813c711e3c72218129e066937c454c31e04\":-1,\"ea563fe0f82ca4eaf1b7b77b6500eb6339828249af3026095bd01e3ed8eef81e\":900053,\"d3663ac353e0b845c625284c86e294c5c7a56f0abfd85a67121ed65ae7f2b4a3\":3196013,\"17f71300f5f896ccdf3ad8b5d59e6984b2f7e4751e1a954a3c22b09d3f35a9fb\":-1,\"1a78650022f906efc151afc71902cb587b99455514a0802a49017eedcc64eecd\":7933240,\"26fc91c0b350cd5a708c3314157641b54c8621f31bb80cf008f563ad4e5febcc\":3685217,\"0da9e55f51a3af2872e79108a89edf897e40206eb5775a413c4bb04c49e2ff35\":833825,\"9a84bfaca5904ed5c3842ea1d62aaa795efa6059008b932b0485644e0378662e\":3245873,\"52ae608e4696d0ad11a42a89401f0e77c5302fcefd1f047d9bd358902e86971b\":8083948,\"6c5143d38d22313d3a586bb6a4228aa4547db5f75c2491ef6985b3a91a507cff\":8083925,\"f48eaf365c681cf0656f4ceeec65478cff6df6fb55fe009c6013219ec91c5da9\":-1,\"fa3fe8b4bd4f6825a287379ae147e62540ec9bb65ab46298e3ba937616afe85a\":8083971,\"6362e76636863df4f972a1a1d483740ed5c1872c3fa582b40c43bbcf6a99be2e\":8084031,\"078bb7f24e157f176fbeefee2023833e1127016b68282338c9a07dcd948afd43\":3443739,\"0d185a0a8aa0b051a8d04263f1123a2bc1121f328b775c3d1fcea7ec6dd4a6ce\":-1,\"d72a0e33f231255f64810efd4eee43922415c497d4261f2981f7e8ddf71d42a7\":87129,\"ad82dc5237378a39abb3bbd8174ac0f77c882573a02c8fac01b4c7a058a96d90\":8083892,\"f5f8456641df2863fb7850e1cd3a18aadadc761e236f00f24b860b21d15eb681\":1917674,\"3cd6673d45e3c45acdf668eb8f3db48d2e600e559d19e9dc4a76f91c2f59fe8b\":8084016,\"da21fcf1dcad0f54f7a141fb4559b5e684be4d683f37fa7efffee8a93fe5ae7e\":1070202,\"3a04a26751675c1ebf9d3a88bf9c39b8f2e304fe83a1519bd8fefaa3c94df828\":2896165,\"925c979a6ee26d6fa3be39319f2e8c7b26becedb89e50199182072a828444599\":4755925,\"87d336bcbba8af52ca239aa4d1a6cf280e23b1c5c3b861df08028a275ec3a218\":7921713,\"89e11132cf82fdee2700a3c8ea9dfcf6fc22dbdadee199adff19b110f67f0d98\":6985682,\"f08161e61c1174610f898f70dad9331f90d393c5657ceb6bd0a0e21e39c24225\":-1,\"f9ce0ddec53cc1ee7cb8d2b76b4525b8bff835dd32fb51e57d321d176827becb\":-1,\"2df34a41c3a5adf6215bcf87990549968e942904c24aff03d0517f43846c9d64\":5025631,\"660226cb99e9e96982fb1f529ba2e7b5da08e204b055bce1a816d65696f8732c\":2975557,\"b2913d1434ba2ca69eaf079c4a7e295c5a43e771f91f8b949027932c6aafdb27\":4278360,\"f72085fa1d746563135eb5aa3d9a8dc9829021c105c8d23f45c55cfc9c7b7c75\":1939024,\"1b5bb95f64c564cab772d43ee5ae2d57a0acecefa134b0adb21bd87ca8d1c9c3\":8083948,\"7df712d6c9dfc0ed42e74e3f8cd80755e46ae8db441557d5adf0bd2607d5ce56\":6449211,\"222298a9236b4e589b71ab3252bf1d371eb4a0b75bc1211775901c9919fe3103\":8083974,\"3c4efd9e65f2bcae52d8bb158d08d2af6113dca4725ed05225c4399fb41e9752\":4575663}"); + RocksDBService.init("/Users/niels/Downloads/testspace/cs81"); + List list2 = RocksDBService.valueList("consensus_agent1"); + for (byte[] arr : list2) { + AgentPo po = new AgentPo(); + po.parse(arr, 0); + Long deleteHeight = Long.parseLong("" + map.get(po.getHash().toHex())); + if (po.getDelHeight() != deleteHeight) { + System.out.println(po.getHash().toHex() + "---ln: " + po.getDelHeight() + " ---04： " + deleteHeight); + } + } + + + } +} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java b/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java index cb38042201..939d0536a3 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java +++ b/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java @@ -1,9 +1,11 @@ package io.nuls.test.storage; +import io.nuls.base.basic.AddressTool; import io.nuls.base.data.NulsHash; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.poc.constant.ConsensusConstant; +import io.nuls.poc.model.po.AgentPo; import io.nuls.poc.model.po.DepositPo; import io.nuls.poc.storage.DepositStorageService; import io.nuls.test.TestUtil; @@ -14,6 +16,7 @@ import org.junit.Test; import java.math.BigInteger; +import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -23,22 +26,44 @@ public class DepositStorageTest { private DepositStorageService depositStorageService; private NulsHash hash = NulsHash.calcHash(new byte[23]); - @Before - public void init(){ - try { - Properties properties = ConfigLoader.loadProperties(ConsensusConstant.DB_CONFIG_NAME); - String path = properties.getProperty(ConsensusConstant.DB_DATA_PATH, ConsensusConstant.DB_DATA_DEFAULT_PATH); - RocksDBService.init(path); - TestUtil.initTable(1); - }catch (Exception e){ - Log.error(e); + // @Before +// public void init() { +// try { +// Properties properties = ConfigLoader.loadProperties(ConsensusConstant.DB_CONFIG_NAME); +// String path = properties.getProperty(ConsensusConstant.DB_DATA_PATH, ConsensusConstant.DB_DATA_DEFAULT_PATH); +// RocksDBService.init(path); +// TestUtil.initTable(1); +// } catch (Exception e) { +// Log.error(e); +// } +// SpringLiteContext.init(ConsensusConstant.CONTEXT_PATH); +// depositStorageService = SpringLiteContext.getBean(DepositStorageService.class); +// } + @Test + public void getAgentList() throws Exception { + RocksDBService.init("/Users/niels/Downloads/nuls-data"); + List list = RocksDBService.valueList("consensus_deposit1"); + List agentPoList = new ArrayList<>(); + for (byte[] val : list) { + DepositPo po = new DepositPo(); + po.parse(val, 0); + agentPoList.add(po); + } + List agentList = new ArrayList<>(); + agentList.add("528a630b43f5d1eeea5b4567e87c7f7f3d4b86046b8a3d079ef0b9a1aea64360"); + agentList.add("a27170a4ad246758cc7fb45ded14b065f6a1919836a2bba34e6dcd9335a054da"); + agentList.add("ad82dc5237378a39abb3bbd8174ac0f77c882573a02c8fac01b4c7a058a96d90"); + agentList.add("d11d29e38b3db75aec0ebb69dc66eb4f6276d0a1d9c7faa6a4fa33b699637447"); + for (DepositPo po : agentPoList) { + if (!agentList.contains(po.getAgentHash().toHex())) { + continue; + } + System.out.println(po.getAgentHash().toHex() + " , " + AddressTool.getStringAddressByBytes(po.getAddress()) + " , " + po.getDeposit().toString() + " , " + po.getDelHeight()); } - SpringLiteContext.init(ConsensusConstant.CONTEXT_PATH); - depositStorageService = SpringLiteContext.getBean(DepositStorageService.class); } @Test - public void saveDeposit()throws Exception{ + public void saveDeposit() throws Exception { DepositPo po = new DepositPo(); po.setAgentHash(hash); po.setTxHash(hash); @@ -47,24 +72,25 @@ public void saveDeposit()throws Exception{ po.setDeposit(BigInteger.valueOf(20000)); po.setTime(NulsDateUtils.getCurrentTimeSeconds()); po.setBlockHeight(100); - System.out.println(depositStorageService.save(po,1)); + System.out.println(depositStorageService.save(po, 1)); getDepositList(); } + @Test - public void getDeposit(){ - DepositPo po = depositStorageService.get(hash,1); + public void getDeposit() { + DepositPo po = depositStorageService.get(hash, 1); assertNotNull(po); } @Test - public void deleteDeposit(){ - System.out.println(depositStorageService.delete(hash,1)); + public void deleteDeposit() { + System.out.println(depositStorageService.delete(hash, 1)); getDeposit(); } @Test - public void getDepositList()throws Exception{ + public void getDepositList() throws Exception { List depositPos = depositStorageService.getList(1); System.out.println(depositPos.size()); } diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java index 8dd86bab35..85e8daaa1b 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java @@ -106,6 +106,7 @@ public Response crossTxRehandle(Map params) throws IOException { crossTxRehandleMessage.setBlockHeight(height); crossTxRehandleMsgHandler.process(chainId,crossTxRehandleMessage); boolean res = NetWorkCall.broadcast(chainId,crossTxRehandleMessage,CommandConstant.CROSS_TX_REHANDLE_MESSAGE,false); + if(res){ return success(Map.of("msg","broadcast success")); }else{ diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java index 60db0b5767..98646350a3 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java @@ -244,7 +244,7 @@ public boolean commitTx(int chainId, List txs, BlockHeader blockHea } chain.getLogger().info("重置本链验证人列表完成:{}",chain.getVerifierList()); int syncStatus = BlockCall.getBlockStatus(chain); - List otherChainInfoList = chainManager.getRegisteredCrossChainList().stream().filter(d->d.getChainId() != chainId).collect(Collectors.toList()); ; + List otherChainInfoList = chainManager.getRegisteredCrossChainList().stream().filter(d->d.getChainId() != chainId).collect(Collectors.toList()); List newTxList = Lists.newArrayList(); otherChainInfoList.forEach(chainInfo -> { try { diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java index ef3324a60f..8da5113e7e 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java @@ -60,6 +60,7 @@ public RegisteredChainMessage get() { public boolean canCross(int assetChainId, int assetId) { RegisteredChainMessage all = get(); if(all == null || all.getChainInfoList() == null){ + Log.error("数据为空了"); return false; } return all.getChainInfoList().stream(). diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java index f7bc957e84..51c72674a5 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java @@ -92,9 +92,9 @@ public boolean validateTx(Chain chain, Transaction tx, BlockHeader blockHeader) if (AddressTool.validContractAddress(from.getAddress(),AddressTool.getChainIdByAddress(from.getAddress()))) { continue; } - + //todo if (!registeredCrossChainService.canCross(from.getAssetsChainId(),from.getAssetsId())){ - throw new NulsException(NulsCrossChainErrorCode.ASSET_NOT_REG_CROSS_CHAIN); +// throw new NulsException(NulsCrossChainErrorCode.ASSET_NOT_REG_CROSS_CHAIN); } } diff --git a/module/nuls-protocol-update/src/main/resources/versions.json b/module/nuls-protocol-update/src/main/resources/versions.json index a49a45efce..362b9b4dc5 100644 --- a/module/nuls-protocol-update/src/main/resources/versions.json +++ b/module/nuls-protocol-update/src/main/resources/versions.json @@ -48,5 +48,25 @@ "version": "10", "effectiveRatio": "80", "continuousIntervalCount": "10" + }, + { + "version": "11", + "effectiveRatio": "70", + "continuousIntervalCount": "10" + }, + { + "version": "12", + "effectiveRatio": "80", + "continuousIntervalCount": "10" + }, + { + "version": "13", + "effectiveRatio": "80", + "continuousIntervalCount": "10" + }, + { + "version": "14", + "effectiveRatio": "80", + "continuousIntervalCount": "10" } ] \ No newline at end of file diff --git a/module/nuls-smart-contract/pom.xml b/module/nuls-smart-contract/pom.xml index 3afd651c01..2428fbf6ca 100644 --- a/module/nuls-smart-contract/pom.xml +++ b/module/nuls-smart-contract/pom.xml @@ -92,17 +92,11 @@ ${asm.version} - - io.nuls.sdk - sdk-contract-vm - 2.1.0.RELEASE - - - - com.alibaba - fastjson - 1.2.76 - + + + + + junit @@ -138,6 +132,16 @@ sdk4j 1.1.6.RELEASE test + + + org.mybatis + mybatis + + + io.nuls.v2 + nuls-core-h2 + + diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java new file mode 100644 index 0000000000..7d258916fb --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java @@ -0,0 +1,291 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.callable; + +import io.nuls.base.RPCUtil; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.CoinData; +import io.nuls.base.data.CoinFrom; +import io.nuls.base.data.CoinTo; +import io.nuls.base.data.NulsHash; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.helper.ContractNewTxHandler; +import io.nuls.contract.helper.ContractTransferHandler; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.manager.ContractTempBalanceManager; +import io.nuls.contract.model.bo.BatchInfoV8; +import io.nuls.contract.model.bo.ContractBalance; +import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.bo.ContractWrapperTransaction; +import io.nuls.contract.model.tx.ContractTransferTransaction; +import io.nuls.contract.model.txdata.CallContractData; +import io.nuls.contract.model.txdata.ContractData; +import io.nuls.contract.model.txdata.ContractTransferData; +import io.nuls.contract.service.ContractExecutor; +import io.nuls.contract.util.ContractUtil; +import io.nuls.contract.util.Log; +import io.nuls.contract.vm.program.ProgramExecutor; +import io.nuls.contract.vm.program.ProgramInternalCreate; +import io.nuls.core.basic.Result; +import io.nuls.core.core.ioc.SpringLiteContext; +import io.nuls.core.exception.NulsException; + +import java.io.IOException; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.List; + +import static io.nuls.contract.config.ContractContext.ASSET_ID; +import static io.nuls.contract.config.ContractContext.CHAIN_ID; +import static io.nuls.contract.util.ContractUtil.extractPublicKey; +import static io.nuls.contract.util.ContractUtil.makeContractResult; +import static io.nuls.core.constant.TxType.*; + +// add by pierre at 2022/6/2 p14 +public class ContractTxCallableV14 { + + private ContractExecutor contractExecutor; + private ContractHelper contractHelper; + private ContractNewTxHandler contractNewTxHandler; + private ContractTransferHandler contractTransferHandler; + private ContractTempBalanceManager tempBalanceManager; + private ProgramExecutor executor; + private String contract; + private ContractWrapperTransaction tx; + private long number; + private String preStateRoot; + private int chainId; + private int blockType; + private long blockTime; + private BatchInfoV8 batchInfo; + + + public ContractTxCallableV14(int chainId, int blockType, long blockTime, ProgramExecutor executor, String contract, ContractWrapperTransaction tx, long number, String preStateRoot) { + this.chainId = chainId; + this.blockType = blockType; + this.blockTime = blockTime; + this.contractExecutor = SpringLiteContext.getBean(ContractExecutor.class); + this.contractHelper = SpringLiteContext.getBean(ContractHelper.class); + this.contractNewTxHandler = SpringLiteContext.getBean(ContractNewTxHandler.class); + this.contractTransferHandler = SpringLiteContext.getBean(ContractTransferHandler.class); + this.tempBalanceManager = contractHelper.getBatchInfoTempBalanceManagerV8(chainId); + this.executor = executor; + this.contract = contract; + this.tx = tx; + this.number = number; + this.preStateRoot = preStateRoot; + } + + public ContractResult call() throws Exception { + ChainManager.chainHandle(chainId, blockType); + this.batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); + String hash = tx.getHash().toHex(); + long start = System.currentTimeMillis(); + ContractData contractData; + ContractResult contractResult = null; + contractData = tx.getContractData(); + int type = tx.getType(); + do { + if (type != DELETE_CONTRACT && !ContractUtil.checkPrice(contractData.getPrice())) { + contractResult = contractHelper.makeFailedContractResult(chainId, tx, null, "The gas price is error."); + break; + } + + switch (type) { + case CREATE_CONTRACT: + contractResult = contractExecutor.create(executor, contractData, number, preStateRoot, extractPublicKey(tx)); + checkCreateResult(tx, contractResult); + break; + case CROSS_CHAIN: + case CALL_CONTRACT: + // 创建合约无论成功与否，后续的其他的跳过执行，视作失败 -> 合约锁定中或者合约不存在 + if (batchInfo.getCreateSet().contains(contract)) { + contractResult = contractHelper.makeFailedContractResult(chainId, tx, null, "contract lock or not exist."); + break; + } + // 删除合约成功后，后续的其他的跳过执行，视作失败 -> 合约已删除 + if (batchInfo.getDeleteSet().contains(contract)) { + contractResult = contractHelper.makeFailedContractResult(chainId, tx, null, "contract has been terminated."); + break; + } + contractHelper.extractAssetInfoFromCallTransaction((CallContractData) contractData, tx); + contractResult = contractExecutor.call(executor, contractData, number, preStateRoot, extractPublicKey(tx)); + checkCallResult(tx, contractResult); + break; + case DELETE_CONTRACT: + contractResult = contractExecutor.delete(executor, contractData, number, preStateRoot); + checkDeleteResult(tx, contractResult); + break; + default: + break; + } + } while (false); + if (contractResult != null) { + if(!contractResult.isSuccess()) { + Log.error("Failed TxType [{}] Execute ContractResult is {}", tx.getType(), contractResult.toString()); + } + } + Log.info("[Per Contract Execution Cost Time] TxType is {}, TxHash is {}, Cost Time is {}", tx.getType(), hash, System.currentTimeMillis() - start); + return contractResult; + } + + private void checkCreateResult(ContractWrapperTransaction tx, ContractResult contractResult) { + makeContractResult(tx, contractResult); + batchInfo.getCreateSet().add(contract); + if (contractResult.isSuccess()) { + Result checkResult = contractHelper.validateNrc20Contract(chainId, (ProgramExecutor) contractResult.getTxTrack(), tx, contractResult); + if (checkResult.isFailed()) { + Log.error("check validateNrc20Contract Result is {}", checkResult.toString()); + } + if (checkResult.isSuccess()) { + commitContract(contractResult); + } + } + } + + + private void checkCallResult(ContractWrapperTransaction tx, ContractResult contractResult) throws IOException, NulsException { + makeContractResult(tx, contractResult); + // 处理合约结果 + dealCallResult(tx, contractResult, chainId); + } + + private void dealCallResult(ContractWrapperTransaction tx, ContractResult contractResult, int chainId) throws IOException, NulsException { + if (contractResult.isSuccess()) { + // 处理合约生成的其他交易、临时余额、合约内部转账 + boolean isSuccess = contractNewTxHandler.handleContractNewTx(chainId, blockTime, tx, contractResult, tempBalanceManager); + if (isSuccess) { + // add by pierre at 2022/6/2 p14 + // 处理内部创建 + List internalCreates = contractResult.getProgramInternalCreates(); + if (internalCreates != null && !internalCreates.isEmpty()) { + for (ProgramInternalCreate internalCreate : internalCreates) { + // 处理内部创建的合约，装到执行结果的`internalCreates`中 + Result checkResult = contractHelper.validateNrc20ContractByInternalCreate(chainId, (ProgramExecutor) contractResult.getTxTrack(), internalCreate, contractResult); + if (checkResult.isFailed()) { + Log.error("ProgramInternalCreate check validateNrc20Contract Result is {}", checkResult.toString()); + isSuccess = false; + break; + } + //TODO pierre 测试内部创建合约后，同一个区块中，发出调用此合约的交易 + batchInfo.getCreateSet().add(AddressTool.getStringAddressByBytes(internalCreate.getContractAddress())); + } + } + } + if (!isSuccess) { + // 处理调用失败的合约，把需要退还的NULS 生成一笔合约内部转账交易，退还给调用者 + this.handleFailedContract(contractResult); + } + } else { + // 处理调用失败的合约，把需要退还的NULS 生成一笔合约内部转账交易，退还给调用者 + this.handleFailedContract(contractResult); + } + // 处理合约内部转账成功后，提交合约 + if (contractResult.isSuccess()) { + commitContract(contractResult); + } + } + + private void handleFailedContract(ContractResult contractResult) throws IOException, NulsException { + ContractWrapperTransaction orginTx = contractResult.getTx(); + ContractData contractData = orginTx.getContractData(); + NulsHash orginTxHash = orginTx.getHash(); + BigInteger value = contractData.getValue(); + byte[] contractAddress = contractData.getContractAddress(); + + int assetChainId, assetId; + CoinData orginTxCoinData = orginTx.getCoinDataInstance(); + List fromList = orginTxCoinData.getFrom(); + for(CoinFrom from : fromList) { + assetChainId = from.getAssetsChainId(); + assetId = from.getAssetsId(); + if (CHAIN_ID != assetChainId || ASSET_ID != assetId) { + // 多个账户向合约转入多个资产，合约执行失败后，退还转入的资产金额 + ContractTransferTransaction tx = this.generateContractTransferTransaction(orginTxHash, contractAddress, from.getAddress(), from.getAmount(), assetChainId, assetId); + contractResult.getContractTransferList().add(tx); + } else if (from.getAmount().compareTo(value) >= 0){ + orginTx.setValueSender(from.getAddress()); + } + } + + if (value.compareTo(BigInteger.ZERO) > 0) { + byte[] sender = orginTx.getValueSender(); + if (sender == null) { + sender = contractData.getSender(); + } + ContractTransferTransaction tx = this.generateContractTransferTransaction(orginTxHash, contractAddress, sender, value, CHAIN_ID, ASSET_ID); + contractResult.getContractTransferList().add(tx); + } + contractResult.setMergedTransferList(contractTransferHandler.contractTransfer2mergedTransfer(orginTx, contractResult.getContractTransferList())); + contractResult.setMergerdMultyAssetTransferList(contractTransferHandler.contractMultyAssetTransfer2mergedTransfer(orginTx, contractResult.getContractTransferList())); + } + + private ContractTransferTransaction generateContractTransferTransaction(NulsHash orginTxHash, byte[] contractAddress, byte[] recipient, BigInteger value, int assetChainId, int assetId) throws IOException { + ContractTransferData txData = new ContractTransferData(orginTxHash, contractAddress); + + CoinData coinData = new CoinData(); + ContractBalance balance = tempBalanceManager.getBalance(contractAddress, assetChainId, assetId).getData(); + byte[] nonceBytes = RPCUtil.decode(balance.getNonce()); + + CoinFrom coinFrom = new CoinFrom(contractAddress, assetChainId, assetId, value, nonceBytes, (byte) 0); + coinData.getFrom().add(coinFrom); + CoinTo coinTo = new CoinTo(recipient, assetChainId, assetId, value, 0L); + coinData.getTo().add(coinTo); + + ContractTransferTransaction tx = new ContractTransferTransaction(); + tx.setCoinDataObj(coinData); + tx.setTxDataObj(txData); + tx.setTime(blockTime); + + tx.serializeData(); + NulsHash hash = NulsHash.calcHash(tx.serializeForHash()); + byte[] hashBytes = hash.getBytes(); + byte[] currentNonceBytes = Arrays.copyOfRange(hashBytes, hashBytes.length - 8, hashBytes.length); + balance.setNonce(RPCUtil.encode(currentNonceBytes)); + tx.setHash(hash); + return tx; + } + + private void commitContract(ContractResult contractResult) { + if (!contractResult.isSuccess()) { + return; + } + Object txTrackObj = contractResult.getTxTrack(); + if (txTrackObj != null && txTrackObj instanceof ProgramExecutor) { + ProgramExecutor txTrack = (ProgramExecutor) txTrackObj; + txTrack.commit(); + } + } + + private boolean checkDeleteResult(ContractWrapperTransaction tx, ContractResult contractResult) { + batchInfo.getDeleteSet().add(contract); + makeContractResult(tx, contractResult); + boolean result = false; + if (contractResult.isSuccess()) { + result = true; + commitContract(contractResult); + } + return result; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java index e9d78d0772..db567dbb1c 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java @@ -54,9 +54,7 @@ import java.io.IOException; import java.math.BigInteger; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import static io.nuls.contract.config.ContractContext.ASSET_ID; import static io.nuls.contract.config.ContractContext.CHAIN_ID; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java index ff87a47ad4..6d6736c77e 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java @@ -70,4 +70,7 @@ public class ContractContext { public static short UPDATE_VERSION_CONTRACT_ASSET = 8; public static short UPDATE_VERSION_CONTRACT_BALANCE = 9; + + public static short UPDATE_VERSION_ACCOUNT_TRANSFER_ON_CONTRACT_CALL = 13; + public static short PROTOCOL_14 = 14; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java index 3c09846a5d..902d346f39 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java @@ -73,4 +73,5 @@ public interface ContractCmdConstant { String TOKEN_TRANSFER_LIST = "sc_token_transfer_list"; String ACCOUNT_CONTRACTS = "sc_account_contracts"; String GET_CROSS_TOKEN_SYSTEM_CONTRACT = "sc_get_cross_token_system_contract"; + String CODE_HASH = "sc_code_hash"; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java index 8fc39fa84b..b5d3d0f5c0 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java @@ -145,4 +145,5 @@ public interface ContractConstant { String RPC_RESULT_KEY = "value"; String RPC_COLLECTION_RESULT_KEY = "list"; String LINE = "_"; + String NULS = "NULS"; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java index 01d3dd412d..7dba6f6e49 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java @@ -44,7 +44,9 @@ import io.nuls.contract.model.txdata.ContractData; import io.nuls.contract.rpc.call.BlockCall; import io.nuls.contract.rpc.call.LedgerCall; +import io.nuls.contract.service.ContractService; import io.nuls.contract.storage.ContractAddressStorageService; +import io.nuls.contract.storage.ContractTokenAddressStorageService; import io.nuls.contract.storage.ContractTokenTransferStorageService; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; @@ -56,12 +58,14 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.model.ByteArrayWrapper; +import io.nuls.core.model.FormatValidUtils; import io.nuls.core.model.LongUtils; import io.nuls.core.model.StringUtils; import org.bouncycastle.util.Arrays; import java.io.IOException; import java.math.BigInteger; +import java.nio.charset.StandardCharsets; import java.util.*; import static io.nuls.contract.config.ContractContext.ASSET_ID; @@ -71,7 +75,6 @@ import static io.nuls.contract.util.ContractUtil.*; import static io.nuls.core.constant.TxType.CROSS_CHAIN; import static io.nuls.core.constant.TxType.DELETE_CONTRACT; -import static io.nuls.core.model.FormatValidUtils.validTokenNameOrSymbol; @Component public class ContractHelper { @@ -84,6 +87,10 @@ public class ContractHelper { private ContractAddressStorageService contractAddressStorageService; @Autowired private ContractTokenTransferStorageService contractTokenTransferStorageService; + @Autowired + private ContractTokenAddressStorageService contractTokenAddressStorageService; + @Autowired + private ContractService contractService; private static final BigInteger MAXIMUM_DECIMALS = BigInteger.valueOf(18L); private static final BigInteger MAXIMUM_TOTAL_SUPPLY = BigInteger.valueOf(2L).pow(256).subtract(BigInteger.ONE); @@ -134,6 +141,16 @@ public List getAllMethods(int chainId, byte[] contractCode) { return getProgramExecutor(chainId).jarMethod(contractCode); } + public byte[] getContractCode(int chainId, byte[] currentStateRoot, byte[] codeAddress) { + ProgramExecutor track = getProgramExecutor(chainId).begin(currentStateRoot); + return track.contractCode(codeAddress); + } + + public byte[] getContractCodeHash(int chainId, byte[] currentStateRoot, byte[] codeAddress) { + ProgramExecutor track = getProgramExecutor(chainId).begin(currentStateRoot); + return track.contractCodeHash(codeAddress); + } + private ProgramMethod getMethodInfo(String methodName, String methodDesc, List methods) { if (methods != null && methods.size() > 0) { boolean emptyDesc = StringUtils.isBlank(methodDesc); @@ -325,13 +342,66 @@ public ProgramResult invokeViewMethod(int chainId, ProgramExecutor executor, boo } public Result validateNrc20Contract(int chainId, ProgramExecutor track, ContractWrapperTransaction tx, ContractResult contractResult) { + ContractData createContractData = tx.getContractData(); + byte[] contractCode = createContractData.getCode(); + return this.validateNrc20Contract(chainId, track, contractResult.getContractAddress(), contractCode, contractResult); + } + + public Result validateNrc20ContractByInternalCreate(int chainId, ProgramExecutor track, ProgramInternalCreate internalCreate, ContractResult contractResult) { + Result result = this.validateNrc20Contract(chainId, track, internalCreate.getContractAddress(), internalCreate.getContractCode(), contractResult); + if (result.isSuccess()) { + ContractInternalCreate create = new ContractInternalCreate(); + create.setSender(internalCreate.getSender()); + create.setContractAddress(internalCreate.getContractAddress()); + create.setCodeCopyBy(internalCreate.getCodeCopyBy()); + create.setArgs(internalCreate.getArgs()); + create.setAcceptDirectTransfer(contractResult.isAcceptDirectTransfer()); + create.setTokenType(contractResult.getTokenType()); + create.setTokenName(contractResult.getTokenName()); + create.setTokenSymbol(contractResult.getTokenSymbol()); + create.setTokenDecimals(contractResult.getTokenDecimals()); + create.setTokenTotalSupply(contractResult.getTokenTotalSupply()); + contractResult.getInternalCreates().add(create); + } else { + contractResult.getInternalCreates().clear(); + } + // 清空本次验证得到的数据 + contractResult.setAcceptDirectTransfer(false); + contractResult.setTokenType(TokenTypeStatus.NOT_TOKEN.status()); + contractResult.setTokenName(null); + contractResult.setTokenSymbol(null); + contractResult.setTokenDecimals(0); + contractResult.setTokenTotalSupply(null); + return result; + } + + private boolean validTokenNameOrSymbol(int chainId, String name) { + if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.PROTOCOL_14 ) { + if (StringUtils.isBlank(name)) { + return false; + } + + String upperCaseName = name.toUpperCase(); + if(upperCaseName.equals(ContractConstant.NULS)) { + return false; + } + + byte[] aliasBytes = name.getBytes(StandardCharsets.UTF_8); + if (aliasBytes.length < 1 || aliasBytes.length > 20) { + return false; + } + return name.matches("^([a-zA-Z0-9]+[a-zA-Z0-9_]*[a-zA-Z0-9]+)|[a-zA-Z0-9]+${1,20}"); + } else { + return FormatValidUtils.validTokenNameOrSymbol(name); + } + } + + public Result validateNrc20Contract(int chainId, ProgramExecutor track, byte[] contractAddress, byte[] contractCode, ContractResult contractResult) { if (contractResult == null) { return Result.getFailed(ContractErrorCode.NULL_PARAMETER); } - ContractData createContractData = tx.getContractData(); - byte[] contractAddress = contractResult.getContractAddress(); long bestBlockHeight = vmContext.getBestHeight(chainId); - List methods = this.getAllMethods(chainId, createContractData.getCode()); + List methods = this.getAllMethods(chainId, contractCode); Map contractMethodsMap = new HashMap<>(); boolean isNrc20 = this.checkNrc20Contract(methods, contractMethodsMap); boolean isNrc721 = false; @@ -352,7 +422,7 @@ public Result validateNrc20Contract(int chainId, ProgramExecutor track, Contract if (programResult.isSuccess()) { String tokenName = programResult.getResult(); if (StringUtils.isNotBlank(tokenName)) { - if (!validTokenNameOrSymbol(tokenName)) { + if (!validTokenNameOrSymbol(chainId, tokenName)) { contractResult.setError(true); contractResult.setErrorMessage("The format of the name is incorrect."); return getFailed(); @@ -365,7 +435,7 @@ public Result validateNrc20Contract(int chainId, ProgramExecutor track, Contract if (programResult.isSuccess()) { String symbol = programResult.getResult(); if (StringUtils.isNotBlank(symbol)) { - if (!validTokenNameOrSymbol(symbol)) { + if (!validTokenNameOrSymbol(chainId, symbol)) { contractResult.setError(true); contractResult.setErrorMessage("The format of the symbol is incorrect."); return getFailed(); @@ -515,6 +585,7 @@ public Result getContractAddressInfo(int chainId, byte[] return contractAddressStorageService.getContractAddressInfo(chainId, contractAddressBytes); } + private Set unlockedNrc20Set = new HashSet<>(); public Result getContractToken(int chainId, BlockHeader blockHeader, String address, String contractAddress) { try { if (StringUtils.isBlank(contractAddress) || StringUtils.isBlank(address)) { @@ -545,10 +616,23 @@ public Result getContractToken(int chainId, BlockHeader block result = getFailed(); result.setMsg(ContractUtil.simplifyErrorMsg(programResult.getErrorMessage())); } else { + BigInteger lockAmount = BigInteger.ZERO; + if (!unlockedNrc20Set.contains(contractAddress)) { + ProgramResult lockedProgramResult = this.invokeViewMethod(chainId, null, false, currentStateRoot, blockHeight, contractAddressBytes, "lockedBalanceOf", null, ContractUtil.twoDimensionalArray(new Object[]{address})); + if (!lockedProgramResult.isSuccess()) { + String errorMessage = lockedProgramResult.getErrorMessage(); + if (errorMessage != null && errorMessage.contains("can't find method")) { + unlockedNrc20Set.add(contractAddress); + } + } else { + lockAmount = new BigInteger(lockedProgramResult.getResult()); + } + } result = getSuccess(); ContractTokenInfo tokenInfo = new ContractTokenInfo(contractAddress, po.getNrc20TokenName(), po.getDecimals(), new BigInteger(programResult.getResult()), po.getNrc20TokenSymbol(), po.getBlockHeight()); ProgramExecutor track = getProgramExecutor(chainId).begin(currentStateRoot); tokenInfo.setStatus(ContractStatus.getStatus(track.status(AddressTool.getAddress(tokenInfo.getContractAddress())).ordinal())); + tokenInfo.setLockAmount(lockAmount); result.setData(tokenInfo); } return result; @@ -563,8 +647,13 @@ public void dealNrc20Events(int chainId, byte[] newestStateRoot, Transaction tx, if (po == null) { return; } + Map infoPoMap = new HashMap<>(); + infoPoMap.put(AddressTool.getStringAddressByBytes(po.getContractAddress()), po); + this.dealNrc20Events(chainId, newestStateRoot, tx.getBlockHeight(), tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); + } + + public void dealNrc20Events(int chainId, byte[] newestStateRoot, long blockHeight, NulsHash txHash, long txTime, List events, boolean execSuccess, Map infoPoMap) { try { - List events = contractResult.getEvents(); int size = events.size(); // 目前只处理Transfer事件, 为了刷新账户的token余额 String event; @@ -584,13 +673,18 @@ public void dealNrc20Events(int chainId, byte[] newestStateRoot, Transaction tx, if (!AddressTool.validAddress(chainId, contractAddress)) { continue; } - byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); - if (Arrays.areEqual(po.getContractAddress(), contractAddressBytes)) { - contractAddressInfo = po; - } else { + contractAddressInfo = infoPoMap.get(contractAddress); + if (contractAddressInfo == null) { + byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); Result contractAddressInfoResult = this.getContractAddressInfo(chainId, contractAddressBytes); contractAddressInfo = contractAddressInfoResult.getData(); } + //if (Arrays.areEqual(po.getContractAddress(), contractAddressBytes)) { + // contractAddressInfo = po; + //} else { + // Result contractAddressInfoResult = this.getContractAddressInfo(chainId, contractAddressBytes); + // contractAddressInfo = contractAddressInfoResult.getData(); + //} if (contractAddressInfo == null) { continue; @@ -605,18 +699,18 @@ public void dealNrc20Events(int chainId, byte[] newestStateRoot, Transaction tx, tokenTransferInfoPo.setName(contractAddressInfo.getNrc20TokenName()); tokenTransferInfoPo.setSymbol(contractAddressInfo.getNrc20TokenSymbol()); tokenTransferInfoPo.setDecimals(contractAddressInfo.getDecimals()); - tokenTransferInfoPo.setTime(tx.getTime()); - tokenTransferInfoPo.setBlockHeight(tx.getBlockHeight()); - txHashBytes = tx.getHash().getBytes(); + tokenTransferInfoPo.setTime(txTime); + tokenTransferInfoPo.setBlockHeight(blockHeight); + txHashBytes = txHash.getBytes(); tokenTransferInfoPo.setTxHash(txHashBytes); - tokenTransferInfoPo.setStatus((byte) (contractResult.isSuccess() ? 1 : 2)); + tokenTransferInfoPo.setStatus((byte) (execSuccess ? 1 : 2)); if (from != null) { - this.refreshTokenBalance(chainId, newestStateRoot, tx.getBlockHeight(), contractAddressInfo, AddressTool.getStringAddressByBytes(from), contractAddress); + this.refreshTokenBalance(chainId, newestStateRoot, blockHeight, contractAddressInfo, AddressTool.getStringAddressByBytes(from), contractAddress); this.saveTokenTransferInfo(chainId, from, txHashBytes, new VarInt(i).encode(), tokenTransferInfoPo); } if (to != null) { - this.refreshTokenBalance(chainId, newestStateRoot, tx.getBlockHeight(), contractAddressInfo, AddressTool.getStringAddressByBytes(to), contractAddress); + this.refreshTokenBalance(chainId, newestStateRoot, blockHeight, contractAddressInfo, AddressTool.getStringAddressByBytes(to), contractAddress); this.saveTokenTransferInfo(chainId, to, txHashBytes, new VarInt(i).encode(), tokenTransferInfoPo); } } @@ -628,11 +722,12 @@ public void dealNrc20Events(int chainId, byte[] newestStateRoot, Transaction tx, } public void rollbackNrc20Events(int chainId, Transaction tx, ContractResult contractResult) { - try { - byte[] txHashBytes = null; - txHashBytes = tx.getHash().getBytes(); + this.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); + } - List events = contractResult.getEvents(); + public void rollbackNrc20Events(int chainId, NulsHash txHasah, List events) { + try { + byte[] txHashBytes = txHasah.getBytes(); int size = events.size(); // 目前只处理Transfer事件, 为了刷新账户的token余额 String event; @@ -733,6 +828,10 @@ public ProgramStatus getContractStatus(int chainId, byte[] stateRoot, byte[] con public ContractResult makeFailedContractResult(int chainId, ContractWrapperTransaction tx, CallableResult callableResult, String errorMsg) { ContractResult contractResult = ContractResult.genFailed(tx.getContractData(), errorMsg); + // add by pierre at 2022/6/17 p14 没有经过虚拟机的交易，不再扣除Gas费用 + if (ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.PROTOCOL_14) { + contractResult.setGasUsed(0); + } makeContractResult(tx, contractResult); if (callableResult != null) { callableResult.putFailed(chainId, contractResult); @@ -805,4 +904,99 @@ public ContractReturnGasTransaction makeReturnGasTx(List resultL } return null; } + + public Result onCommitForCreateV14(int chainId, BlockHeader blockHeader, ContractCreate contractCreate, + NulsHash hash, long txTime, byte[] contractAddress, byte[] sender, byte[] contractCode, String alias, Map infoPoMap) throws Exception { + long blockHeight = blockHeader.getHeight(); + + + String contractAddressStr = AddressTool.getStringAddressByBytes(contractAddress); + + ContractAddressInfoPo info = new ContractAddressInfoPo(); + info.setContractAddress(contractAddress); + info.setSender(sender); + info.setCreateTxHash(hash.getBytes()); + info.setAlias(alias); + info.setCreateTime(txTime); + info.setBlockHeight(blockHeight); + + boolean isNrc20Contract = TOKEN_TYPE_NRC20 == contractCreate.getTokenType(); + boolean isNrc721Contract = TOKEN_TYPE_NRC721 == contractCreate.getTokenType(); + boolean acceptDirectTransfer = contractCreate.isAcceptDirectTransfer(); + info.setAcceptDirectTransfer(acceptDirectTransfer); + info.setNrc20(isNrc20Contract); + info.setTokenType(contractCreate.getTokenType()); + do { + if (!isNrc20Contract && !isNrc721Contract) { + break; + } + // 获取 token tracker + // 处理NRC20/NRC721 token数据 + String tokenName = contractCreate.getTokenName(); + String tokenSymbol = contractCreate.getTokenSymbol(); + int tokenDecimals = contractCreate.getTokenDecimals(); + BigInteger tokenTotalSupply = contractCreate.getTokenTotalSupply(); + info.setNrc20TokenName(tokenName); + info.setNrc20TokenSymbol(tokenSymbol); + if (!isNrc20Contract) { + break; + } + // 处理NRC20 token数据 + info.setDecimals(tokenDecimals); + info.setTotalSupply(tokenTotalSupply); + + // 保存NRC20-token地址 + Result result = contractTokenAddressStorageService.saveTokenAddress(chainId, contractAddress); + if (result.isFailed()) { + return result; + } + // 调用账本模块，登记资产id，当NRC20合约存在[transferCrossChain]方法时，才登记资产id + List methods = this.getAllMethods(chainId, contractCode); + boolean isNewNrc20 = false; + for(ProgramMethod method : methods) { + if(ContractConstant.CROSS_CHAIN_NRC20_CONTRACT_TRANSFER_OUT_METHOD_NAME.equals(method.getName()) && + ContractConstant.CROSS_CHAIN_NRC20_CONTRACT_TRANSFER_OUT_METHOD_DESC.equals(method.getDesc())) { + isNewNrc20 = true; + break; + } + } + if(isNewNrc20) { + Log.info("CROSS-NRC20-TOKEN contract [{}] 向账本注册合约资产", contractAddressStr); + Map resultMap = LedgerCall.commitNRC20Assets(chainId, tokenName, tokenSymbol, (short) tokenDecimals, tokenTotalSupply, contractAddressStr); + if(resultMap != null) { + // 缓存合约地址和合约资产ID + int assetId = Integer.parseInt(resultMap.get("assetId").toString()); + Chain chain = this.getChain(chainId); + Map tokenAssetsInfoMap = chain.getTokenAssetsInfoMap(); + Map tokenAssetsContractAddressInfoMap = chain.getTokenAssetsContractAddressInfoMap(); + tokenAssetsInfoMap.put(contractAddressStr, new ContractTokenAssetsInfo(chainId, assetId)); + tokenAssetsContractAddressInfoMap.put(chainId + "-" + assetId, contractAddressStr); + } + } + } while (false); + infoPoMap.put(contractAddressStr, info); + return contractAddressStorageService.saveContractAddress(chainId, contractAddress, info); + } + + public Result onRollbackForCreateV14(int chainId, byte[] contractAddress, boolean isNrc20) throws Exception { + String contractAddressStr = AddressTool.getStringAddressByBytes(contractAddress); + // 调用账本模块，回滚已登记的资产id + if(isNrc20) { + LedgerCall.rollBackNRC20Assets(chainId, AddressTool.getStringAddressByBytes(contractAddress)); + // 清理缓存 + Chain chain = this.getChain(chainId); + Map tokenAssetsInfoMap = chain.getTokenAssetsInfoMap(); + ContractTokenAssetsInfo tokenAssetsInfo = tokenAssetsInfoMap.remove(contractAddressStr); + if(tokenAssetsInfo != null) { + Map tokenAssetsContractAddressInfoMap = chain.getTokenAssetsContractAddressInfoMap(); + tokenAssetsContractAddressInfoMap.remove(chainId + "-" + tokenAssetsInfo.getAssetId()); + } + } + //this.rollbackNrc20Events(chainId, tx, contractResult); + Result result = contractAddressStorageService.deleteContractAddress(chainId, contractAddress); + if (result.isFailed()) { + return result; + } + return contractTokenAddressStorageService.deleteTokenAddress(chainId, contractAddress); + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTxHelper.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTxHelper.java index c1b0a2e959..b42022fb4e 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTxHelper.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTxHelper.java @@ -32,6 +32,7 @@ import io.nuls.contract.manager.ContractTxValidatorManager; import io.nuls.contract.model.bo.ContractBalance; import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.model.po.ContractAddressInfoPo; import io.nuls.contract.model.tx.CallContractTransaction; import io.nuls.contract.model.tx.CreateContractTransaction; @@ -131,7 +132,7 @@ public Result newCreateTx(int chainId, String sender, * 多扣除的费用会以ContractReturnGasTransaction交易还给Sender */ CoinData coinData = new CoinData(); - Result makeCoinDataResult = this.makeCoinData(chainId, sender, senderBytes, contractAddressBytes, gasLimit, price, value, tx.size(), createContractData, coinData, null); + Result makeCoinDataResult = this.makeCoinData(chainId, sender, senderBytes, contractAddressBytes, gasLimit, price, value, tx.size(), createContractData, coinData, null, null); if (makeCoinDataResult.isFailed()) { return makeCoinDataResult; } @@ -226,7 +227,7 @@ private int calcSize(NulsData nulsData) { return VarInt.sizeOf(size) + size - 1; } - public Result makeCoinData(int chainId, String sender, byte[] senderBytes, byte[] contractAddress, long gasLimit, long price, BigInteger value, int txSize, NulsData txData, CoinData coinData, List multyAssetValues) { + public Result makeCoinData(int chainId, String sender, byte[] senderBytes, byte[] contractAddress, long gasLimit, long price, BigInteger value, int txSize, NulsData txData, CoinData coinData, List multyAssetValues, List nulsValueToOtherList) { long gasUsed = gasLimit; BigInteger imputedValue = BigInteger.valueOf(LongUtils.mul(gasUsed, price)); // 总花费 @@ -234,15 +235,19 @@ public Result makeCoinData(int chainId, String sender, byte[] senderBytes, byte[ int assetChainId = CHAIN_ID; int assetId = ASSET_ID; totalValue = totalValue.add(value); + if (value.compareTo(BigInteger.ZERO) > 0) { + coinData.addTo(new CoinTo(contractAddress, assetChainId, assetId, value)); + } + if (nulsValueToOtherList != null && !nulsValueToOtherList.isEmpty()) { + for (AccountAmountDto dto : nulsValueToOtherList) { + totalValue = totalValue.add(dto.getValue()); + coinData.addTo(new CoinTo(AddressTool.getAddress(dto.getTo()), assetChainId, assetId, dto.getValue())); + } + } ContractBalance senderBalance = contractHelper.getUnConfirmedBalanceAndNonce(chainId, assetChainId, assetId, sender); CoinFrom coinFrom = new CoinFrom(senderBytes, assetChainId, assetId, totalValue, RPCUtil.decode(senderBalance.getNonce()), UNLOCKED_TX); coinData.addFrom(coinFrom); - if (value.compareTo(BigInteger.ZERO) > 0) { - CoinTo coinTo = new CoinTo(contractAddress, assetChainId, assetId, value); - coinData.addTo(coinTo); - } - if (multyAssetValues != null && !multyAssetValues.isEmpty()) { BigInteger _value; for (ProgramMultyAssetValue multyAssetValue : multyAssetValues) { @@ -291,7 +296,7 @@ public CreateContractData getCreateContractData(byte[] senderBytes, byte[] contr public Result makeCallTx(int chainId, String sender, BigInteger value, Long gasLimit, Long price, String contractAddress, String methodName, String methodDesc, String[][] args, - String password, String remark, List multyAssetValues) { + String password, String remark, List multyAssetValues, List nulsValueToOtherList) { if (value == null) { value = BigInteger.ZERO; @@ -310,12 +315,12 @@ public Result makeCallTx(int chainId, String sender, Bi return validateCall; } - Result result = this.newCallTx(chainId, sender, senderBytes, value, gasLimit, price, contractAddressBytes, methodName, methodDesc, args, remark, multyAssetValues); + Result result = this.newCallTx(chainId, sender, senderBytes, value, gasLimit, price, contractAddressBytes, methodName, methodDesc, args, remark, multyAssetValues, nulsValueToOtherList); return result; } public Result newCallTx(int chainId, String sender, byte[] senderBytes, BigInteger value, Long gasLimit, Long price, byte[] contractAddressBytes, - String methodName, String methodDesc, String[][] args, String remark, List multyAssetValues) { + String methodName, String methodDesc, String[][] args, String remark, List multyAssetValues, List nulsValueToOtherList) { try { CallContractTransaction tx = new CallContractTransaction(); @@ -335,7 +340,7 @@ public Result newCallTx(int chainId, String sender, byt * 多扣除的费用会以CoinBase交易还给Sender */ CoinData coinData = new CoinData(); - Result makeCoinDataResult = this.makeCoinData(chainId, sender, senderBytes, contractAddressBytes, gasLimit, price, value, tx.size(), callContractData, coinData, multyAssetValues); + Result makeCoinDataResult = this.makeCoinData(chainId, sender, senderBytes, contractAddressBytes, gasLimit, price, value, tx.size(), callContractData, coinData, multyAssetValues, nulsValueToOtherList); if (makeCoinDataResult.isFailed()) { return makeCoinDataResult; } @@ -568,7 +573,7 @@ public Result newDeleteTx(int chainId, String sender, * 没有Gas消耗，在终止智能合约里 */ CoinData coinData = new CoinData(); - Result makeCoinDataResult = this.makeCoinData(chainId, sender, senderBytes, contractAddressBytes, 0L, 0L, BigInteger.ZERO, tx.size(), deleteContractData, coinData, null); + Result makeCoinDataResult = this.makeCoinData(chainId, sender, senderBytes, contractAddressBytes, 0L, 0L, BigInteger.ZERO, tx.size(), deleteContractData, coinData, null, null); if (makeCoinDataResult.isFailed()) { return makeCoinDataResult; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java index 35700f4f40..5d25c13d82 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java @@ -55,6 +55,12 @@ public Result createValidator(int chainId, CreateContractTransaction tx) throws } public Result callValidator(int chainId, CallContractTransaction tx) throws NulsException { + if (ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.PROTOCOL_14) { + return callContractTxValidator.validateV14(chainId, tx); + } + if (ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_ACCOUNT_TRANSFER_ON_CONTRACT_CALL) { + return callContractTxValidator.validateV13(chainId, tx); + } if (ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { return callContractTxValidator.validateV8(chainId, tx); } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java index 5d8d973914..66dc9a4929 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java @@ -189,6 +189,12 @@ public void clearOldBatchInfo() { this.verifyBatchInfo = null; } + public void clearBatchInfo() { + Log.info("clear BatchInfo."); + this.batchInfoV8 = null; + this.verifyBatchInfoV8 = null; + } + public BatchInfoV8 getBatchInfoV8() { Integer blockType = currentThreadBlockType.get(); if(blockType == null) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java new file mode 100644 index 0000000000..b761fce6cf --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java @@ -0,0 +1,86 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.contract.model.bo; + +import java.math.BigInteger; + +// add by pierre at 2022/6/1 p14 +public class ContractCreate { + private boolean acceptDirectTransfer; + // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 + private int tokenType; + private String tokenName; + private String tokenSymbol; + private int tokenDecimals; + private BigInteger tokenTotalSupply; + + public boolean isAcceptDirectTransfer() { + return acceptDirectTransfer; + } + + public void setAcceptDirectTransfer(boolean acceptDirectTransfer) { + this.acceptDirectTransfer = acceptDirectTransfer; + } + + public int getTokenType() { + return tokenType; + } + + public void setTokenType(int tokenType) { + this.tokenType = tokenType; + } + + public String getTokenName() { + return tokenName; + } + + public void setTokenName(String tokenName) { + this.tokenName = tokenName; + } + + public String getTokenSymbol() { + return tokenSymbol; + } + + public void setTokenSymbol(String tokenSymbol) { + this.tokenSymbol = tokenSymbol; + } + + public int getTokenDecimals() { + return tokenDecimals; + } + + public void setTokenDecimals(int tokenDecimals) { + this.tokenDecimals = tokenDecimals; + } + + public BigInteger getTokenTotalSupply() { + return tokenTotalSupply; + } + + public void setTokenTotalSupply(BigInteger tokenTotalSupply) { + this.tokenTotalSupply = tokenTotalSupply; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java new file mode 100644 index 0000000000..b931ad7b0e --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java @@ -0,0 +1,65 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.contract.model.bo; + +// add by pierre at 2022/6/1 p14 +public class ContractInternalCreate extends ContractCreate{ + private byte[] sender;// 创建者 + private byte[] contractAddress;// 合约地址 + private byte[] codeCopyBy;// 内部创建所依据的合约 + private String[][] args;// 参数列表 + + public byte[] getSender() { + return sender; + } + + public void setSender(byte[] sender) { + this.sender = sender; + } + + public byte[] getContractAddress() { + return contractAddress; + } + + public void setContractAddress(byte[] contractAddress) { + this.contractAddress = contractAddress; + } + + public byte[] getCodeCopyBy() { + return codeCopyBy; + } + + public void setCodeCopyBy(byte[] codeCopyBy) { + this.codeCopyBy = codeCopyBy; + } + + public String[][] getArgs() { + return args; + } + + public void setArgs(String[][] args) { + this.args = args; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java index 76b86d3763..d220aba159 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java @@ -30,9 +30,9 @@ import io.nuls.contract.model.tx.ContractTransferTransaction; import io.nuls.contract.model.txdata.ContractData; import io.nuls.contract.vm.program.ProgramAccount; +import io.nuls.contract.vm.program.ProgramInternalCreate; import io.nuls.contract.vm.program.ProgramInvokeRegisterCmd; import io.nuls.contract.vm.program.ProgramTransfer; -import org.ethereum.db.ByteArrayWrapper; import java.math.BigInteger; import java.util.ArrayList; @@ -99,11 +99,30 @@ public class ContractResult { private boolean isTerminated; private Set contractAddressInnerCallSet; private List mergerdMultyAssetTransferList = new ArrayList<>(); + // add by pierre at 2022/6/2 p14 + private List internalCreates = new ArrayList<>(); + private transient List programInternalCreates = new ArrayList<>(); private transient Object txTrack; private transient Map accounts; private transient List orderedInnerTxs = new ArrayList<>(); + public List getInternalCreates() { + return internalCreates; + } + + public void setInternalCreates(List internalCreates) { + this.internalCreates = internalCreates; + } + + public List getProgramInternalCreates() { + return programInternalCreates; + } + + public void setProgramInternalCreates(List programInternalCreates) { + this.programInternalCreates = programInternalCreates; + } + public Map getAccounts() { return accounts; } @@ -139,7 +158,7 @@ public int hashCode() { return result; } - public static ContractResult genFailed(ContractData contractData) { + private static ContractResult genFailed(ContractData contractData) { ContractResult contractResult = new ContractResult(); contractResult.setContractAddress(contractData.getContractAddress()); contractResult.setGasUsed(contractData.getGasLimit()); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java index d4882b53b1..2fb31984c1 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java @@ -39,6 +39,7 @@ public class ContractTokenInfo { private String name; private String symbol; private BigInteger amount; + private BigInteger lockAmount; private long decimals; private long blockHeight; private ContractStatus status; @@ -49,12 +50,21 @@ public ContractTokenInfo() { public ContractTokenInfo(String contractAddress, String name, long decimals, BigInteger amount, String symbol, long blockHeight) { this.name = name; this.amount = amount; + this.lockAmount = BigInteger.ZERO; this.contractAddress = contractAddress; this.decimals = decimals; this.symbol = symbol; this.blockHeight = blockHeight; } + public BigInteger getLockAmount() { + return lockAmount; + } + + public void setLockAmount(BigInteger lockAmount) { + this.lockAmount = lockAmount; + } + public ContractTokenInfo setName(String name) { this.name = name; return this; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java new file mode 100644 index 0000000000..bcb17d9bfa --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java @@ -0,0 +1,65 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.model.dto; + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; + +import java.math.BigInteger; + +/** + * @author: PierreLuo + * @date: 2019-03-06 + */ +@ApiModel +public class AccountAmountDto { + @ApiModelProperty(description = "转入金额") + private BigInteger value; + @ApiModelProperty(description = "转入地址") + private String to; + + public AccountAmountDto(BigInteger value, String to) { + this.value = value; + this.to = to; + } + + public AccountAmountDto() { + } + + public BigInteger getValue() { + return value; + } + + public void setValue(BigInteger value) { + this.value = value; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java new file mode 100644 index 0000000000..72add315f4 --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java @@ -0,0 +1,89 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.model.dto; + + +import io.nuls.base.basic.AddressTool; +import io.nuls.contract.model.bo.ContractInternalCreate; +import io.nuls.contract.model.txdata.ContractData; +import io.nuls.contract.model.txdata.CreateContractData; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; + +import java.util.Arrays; + +/** + * @author: PierreLuo + */ +@ApiModel +public class ContractInternalCreateDto { + @ApiModelProperty(description = "交易创建者地址") + private String sender; + @ApiModelProperty(description = "创建的合约地址") + private String contractAddress; + @ApiModelProperty(description = "内部创建所依据的合约") + private String codeCopyBy; + @ApiModelProperty(description = "参数列表") + private String args; + + public ContractInternalCreateDto(ContractInternalCreate internalCreate) { + this.sender = AddressTool.getStringAddressByBytes(internalCreate.getSender()); + this.contractAddress = AddressTool.getStringAddressByBytes(internalCreate.getContractAddress()); + this.codeCopyBy = AddressTool.getStringAddressByBytes(internalCreate.getCodeCopyBy()); + this.args = internalCreate.getArgs() == null ? null : Arrays.deepToString(internalCreate.getArgs()); + } + + public String getSender() { + return sender; + } + + public void setSender(String sender) { + this.sender = sender; + } + + public String getContractAddress() { + return contractAddress; + } + + public void setContractAddress(String contractAddress) { + this.contractAddress = contractAddress; + } + + public String getCodeCopyBy() { + return codeCopyBy; + } + + public void setCodeCopyBy(String codeCopyBy) { + this.codeCopyBy = codeCopyBy; + } + + public String getArgs() { + return args; + } + + public void setArgs(String args) { + this.args = args; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java index 00625a05b7..81a442bddb 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java @@ -25,6 +25,7 @@ import io.nuls.base.basic.AddressTool; import io.nuls.contract.enums.CmdRegisterMode; +import io.nuls.contract.model.bo.ContractInternalCreate; import io.nuls.contract.model.bo.ContractMergedTransfer; import io.nuls.contract.model.bo.ContractMultyAssetMergedTransfer; import io.nuls.contract.model.bo.ContractResult; @@ -41,8 +42,10 @@ import java.math.BigInteger; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.stream.Collectors; import static io.nuls.contract.constant.ContractConstant.TOKEN_TYPE_NRC20; import static io.nuls.contract.constant.ContractConstant.TOKEN_TYPE_NRC721; @@ -97,6 +100,8 @@ public class ContractResultDto { private List contractTxList; @ApiModelProperty(description = "备注") private String remark; + @ApiModelProperty(description = "内部创建的合约列表", type = @TypeDescriptor(value = List.class, collectionElement = ContractInternalCreateDto.class)) + private List internalCreates; public ContractResultDto() { } @@ -136,6 +141,7 @@ public ContractResultDto(int chainId, ContractResult result, ContractBaseTransac if (result.isSuccess()) { this.makeTokenTransfers(chainId, result.getEvents()); this.makeInvokeRegisterCmds(result.getInvokeRegisterCmds()); + this.makeInternalCreates(result.getInternalCreates()); } } @@ -164,6 +170,7 @@ public ContractResultDto(int chainId, ContractResult result, long gasLimit) thro if (result.isSuccess()) { this.makeTokenTransfers(chainId, result.getEvents()); this.makeInvokeRegisterCmds(result.getInvokeRegisterCmds()); + this.makeInternalCreates(result.getInternalCreates()); } } @@ -183,6 +190,14 @@ private void makeInvokeRegisterCmds(List invokeRegiste } } + private void makeInternalCreates(List internalCreates) { + if (internalCreates != null && internalCreates.size() > 0) { + this.internalCreates = internalCreates.stream().map(ic -> new ContractInternalCreateDto(ic)).collect(Collectors.toList()); + } else { + this.internalCreates = Collections.EMPTY_LIST; + } + } + public List getTokenTransfers() { return tokenTransfers == null ? new ArrayList<>() : tokenTransfers; } @@ -397,4 +412,12 @@ public List getContractTxList() { public void setContractTxList(List contractTxList) { this.contractTxList = contractTxList; } + + public List getInternalCreates() { + return internalCreates == null ? Collections.EMPTY_LIST : internalCreates; + } + + public void setInternalCreates(List internalCreates) { + this.internalCreates = internalCreates; + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java index 4b0db0d169..042f6d3f28 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java @@ -42,8 +42,10 @@ public class ContractTokenInfoDto { private String name; @ApiModelProperty(description = "token符号") private String symbol; - @ApiModelProperty(description = "token数量") + @ApiModelProperty(description = "token可用数量") private String amount; + @ApiModelProperty(description = "token锁定数量") + private String lockAmount; @ApiModelProperty(description = "token支持的小数位数") private long decimals; @ApiModelProperty(description = "合约创建时的区块高度") @@ -62,6 +64,7 @@ public ContractTokenInfoDto(ContractTokenInfo info) { this.name = info.getName(); this.symbol = info.getSymbol(); this.amount = ContractUtil.bigInteger2String(info.getAmount()); + this.lockAmount = ContractUtil.bigInteger2String(info.getLockAmount()); this.decimals = info.getDecimals(); this.blockHeight = info.getBlockHeight(); this.status = info.getStatus().status(); @@ -99,6 +102,14 @@ public void setAmount(String amount) { this.amount = amount; } + public String getLockAmount() { + return lockAmount; + } + + public void setLockAmount(String lockAmount) { + this.lockAmount = lockAmount; + } + public long getDecimals() { return decimals; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java index aebc7d6108..0db551b8ca 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java @@ -26,8 +26,10 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; +import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractErrorCode; import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.model.bo.ContractInternalCreate; import io.nuls.contract.model.bo.ContractResult; import io.nuls.contract.model.bo.ContractWrapperTransaction; import io.nuls.contract.model.dto.CallContractDataDto; @@ -49,6 +51,10 @@ import io.nuls.core.parse.JSONUtils; import org.bouncycastle.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static io.nuls.contract.util.ContractUtil.getFailed; /** @@ -244,5 +250,83 @@ public Result onRollbackV8(int chainId, ContractWrapperTransaction tx) { } } + // add by pierre at 2022/6/6 p14 + public Result onCommitV14(int chainId, ContractWrapperTransaction tx) { + try { + BlockHeader blockHeader = contractHelper.getBatchInfoCurrentBlockHeaderV8(chainId); + byte[] stateRoot = blockHeader.getStateRoot(); + long blockHeight = blockHeader.getHeight(); + ContractResult contractResult = tx.getContractResult(); + contractResult.setBlockHeight(blockHeight); + + // 保存代币交易 + ContractData callContractData = tx.getContractData(); + byte[] contractAddress = callContractData.getContractAddress(); + String contractAddressStr = AddressTool.getStringAddressByBytes(contractAddress); + + Result contractAddressInfoPoResult = contractHelper.getContractAddressInfo(chainId, contractAddress); + ContractAddressInfoPo contractAddressInfoPo = contractAddressInfoPoResult.getData(); + contractResult.setNrc20(contractAddressInfoPo.isNrc20()); + tx.setBlockHeight(blockHeight); + + Map infoPoMap = new HashMap<>(); + infoPoMap.put(contractAddressStr, contractAddressInfoPo); + // 处理内部创建合约 + List internalCreates = contractResult.getInternalCreates(); + if (internalCreates != null && !internalCreates.isEmpty()) { + for (ContractInternalCreate internalCreate : internalCreates) { + Result result = contractHelper.onCommitForCreateV14(chainId, blockHeader, internalCreate, tx.getHash(), tx.getTime(), internalCreate.getContractAddress(), + internalCreate.getSender(), contractHelper.getContractCode(chainId, stateRoot, internalCreate.getCodeCopyBy()), "internal_create", infoPoMap); + if (result.isFailed()) { + return result; + } + } + } + // 处理合约事件 + contractHelper.dealNrc20Events(chainId, stateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); + + // 保存合约执行结果 + return contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); + } catch (Exception e) { + Log.error("save call contract tx error.", e); + return getFailed(); + } + } + + public Result onRollbackV14(int chainId, ContractWrapperTransaction tx) { + try { + // 回滚代币转账交易 + ContractResult contractResult = tx.getContractResult(); + if (contractResult == null) { + contractResult = contractService.getContractExecuteResult(chainId, tx.getHash()); + } + if (contractResult == null) { + return ContractUtil.getSuccess(); + } + try { + CallContractData contractData = (CallContractData) tx.getContractData(); + Log.info("rollback call tx, contract data is {}, result is {}", JSONUtils.obj2json(new CallContractDataDto(contractData)), JSONUtils.obj2json(new ContractResultDto(chainId, contractResult, contractData.getGasLimit()))); + } catch (Exception e) { + Log.warn("failed to trace call rollback log, error is {}", e.getMessage()); + } + contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); + // 处理内部创建合约 + List internalCreates = contractResult.getInternalCreates(); + if (internalCreates != null && !internalCreates.isEmpty()) { + for (ContractInternalCreate internalCreate : internalCreates) { + Result result = contractHelper.onRollbackForCreateV14(chainId, internalCreate.getContractAddress(), internalCreate.getTokenType() == ContractConstant.TOKEN_TYPE_NRC20); + if (result.isFailed()) { + return result; + } + } + } + // 删除合约执行结果 + return contractService.deleteContractExecuteResult(chainId, tx.getHash()); + } catch (Exception e) { + Log.error("rollback call contract tx error.", e); + return getFailed(); + } + } + } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java index c55eef8f5f..2a9c5ceb76 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java @@ -31,15 +31,10 @@ import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.helper.ContractHelper; -import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.ContractResult; -import io.nuls.contract.model.bo.ContractTokenAssetsInfo; -import io.nuls.contract.model.bo.ContractWrapperTransaction; -import io.nuls.contract.model.dto.CallContractDataDto; +import io.nuls.contract.model.bo.*; import io.nuls.contract.model.dto.ContractResultDto; import io.nuls.contract.model.dto.CreateContractDataDto; import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.model.txdata.CallContractData; import io.nuls.contract.model.txdata.ContractData; import io.nuls.contract.model.txdata.CreateContractData; import io.nuls.contract.rpc.call.LedgerCall; @@ -53,11 +48,9 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.parse.JSONUtils; -import java.math.BigInteger; -import java.util.List; -import java.util.Map; import java.math.BigInteger; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -350,5 +343,69 @@ public Result onRollbackV8(int chainId, ContractWrapperTransaction tx) throws Ex return contractService.deleteContractExecuteResult(chainId, tx.getHash()); } + // add by pierre at 2022/6/6 p14 + public Result onCommitV14(int chainId, ContractWrapperTransaction tx) throws Exception { + BlockHeader blockHeader = contractHelper.getBatchInfoCurrentBlockHeaderV8(chainId); + long blockHeight = blockHeader.getHeight(); + tx.setBlockHeight(blockHeight); + ContractResult contractResult = tx.getContractResult(); + contractResult.setBlockHeight(blockHeight); + Result saveContractExecuteResult = contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); + if (saveContractExecuteResult.isFailed()) { + return saveContractExecuteResult; + } + // 执行失败的合约直接返回 + if (!contractResult.isSuccess()) { + return getSuccess(); + } + CreateContractData txData = (CreateContractData) tx.getContractData(); + byte[] contractAddress = txData.getContractAddress(); + byte[] sender = txData.getSender(); + String alias = txData.getAlias(); + byte[] code = txData.getCode(); + byte[] newestStateRoot = blockHeader.getStateRoot(); + + ContractCreate create = new ContractCreate(); + create.setTokenType(contractResult.getTokenType()); + create.setTokenName(contractResult.getTokenName()); + create.setTokenSymbol(contractResult.getTokenSymbol()); + create.setTokenDecimals(contractResult.getTokenDecimals()); + create.setTokenTotalSupply(contractResult.getTokenTotalSupply()); + create.setAcceptDirectTransfer(contractResult.isAcceptDirectTransfer()); + Map infoPoMap = new HashMap<>(); + Result result = contractHelper.onCommitForCreateV14(chainId, blockHeader, create, tx.getHash(), tx.getTime(), contractAddress, sender, code, alias, infoPoMap); + if (result.isFailed()) { + return result; + } + //处理NRC20合约事件 + contractHelper.dealNrc20Events(chainId, newestStateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); + return result; + } + + public Result onRollbackV14(int chainId, ContractWrapperTransaction tx) throws Exception { + ContractData txData = tx.getContractData(); + byte[] contractAddress = txData.getContractAddress(); + // 回滚代币转账交易 + ContractResult contractResult = tx.getContractResult(); + if (contractResult == null) { + contractResult = contractService.getContractExecuteResult(chainId, tx.getHash()); + } + if (contractResult == null) { + return Result.getSuccess(null); + } + try { + CreateContractData contractData = (CreateContractData) tx.getContractData(); + Log.info("rollback create tx, contract data is {}, result is {}", JSONUtils.obj2json(new CreateContractDataDto(contractData)), JSONUtils.obj2json(new ContractResultDto(chainId, contractResult, contractData.getGasLimit()))); + } catch (Exception e) { + Log.warn("failed to trace create rollback log, error is {}", e.getMessage()); + } + contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); + Result result = contractHelper.onRollbackForCreateV14(chainId, contractAddress, contractResult.isNrc20()); + if (result.isFailed()) { + return result; + } + return contractService.deleteContractExecuteResult(chainId, tx.getHash()); + } + } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/AccountCall.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/AccountCall.java index 5b60e2ad7b..e0da95c458 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/AccountCall.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/AccountCall.java @@ -84,6 +84,23 @@ public static Result validationPassword(int chainId, String address, String pass } } + public static boolean validationWhitelistForTransferOnContractCall(int chainId, String address) { + try { + if (StringUtils.isBlank(address)) { + return false; + } + Map params = new HashMap<>(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("address", address); + Map resultMap = (Map) CallHelper.request(ModuleE.AC.abbr, "ac_validationWhitelistForTransferOnContractCall", params); + boolean validate = (boolean) resultMap.get("value"); + return validate; + } catch (Exception e) { + Log.error(e); + return false; + } + } + public static void transactionSignature(int chainId, String address, String password, Transaction tx) throws NulsException { try { P2PHKSignature p2PHKSignature = new P2PHKSignature(); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java index 1cb1c51a05..bb10c0bc45 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java @@ -139,7 +139,21 @@ public Response invokeContractOneByOne(Map params) { tx.parse(RPCUtil.decode(txData), 0); String hash = tx.getHash().toHex(); Map dealResult = new HashMap<>(2); - if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET ) { + if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.PROTOCOL_14 ) { + // add by pierre at 2022/6/2 p14 + Result result = contractService.invokeContractOneByOneV14(chainId, tx); + if (result.isFailed()) { + return wrapperFailed(result); + } + if (result.getData() == null) { + Map resultData = new HashMap<>(); + resultData.put("success", true); + resultData.put("gasUsed", 0); + resultData.put("txList", List.of()); + return success(resultData); + } + return success(result.getData()); + } else if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET ) { Result result = contractService.invokeContractOneByOneV8(chainId, tx); if (result.isFailed()) { return wrapperFailed(result); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java index ae49277676..4aa311d2f6 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java @@ -286,7 +286,8 @@ public Response validateCreate(Map params) { @Parameter(parameterName = "methodName", parameterDes = "合约方法"), @Parameter(parameterName = "methodDesc", parameterDes = "合约方法描述，若合约内方法没有重载，则此参数可以为空", canNull = true), @Parameter(parameterName = "args", requestType = @TypeDescriptor(value = Object[].class), parameterDes = "参数列表", canNull = true), - @Parameter(parameterName = "remark", parameterDes = "交易备注", canNull = true) + @Parameter(parameterName = "remark", parameterDes = "交易备注", canNull = true), + @Parameter(parameterName = "nulsValueToOthers", requestType = @TypeDescriptor(value = String[][].class), parameterDes = "调用者向其他账户地址转入的NULS资产金额，没有此业务时填空，规则: [[,

]]") }) @ResponseData(name = "返回值", description = "返回一个Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "txHash", description = "调用合约的交易hash") @@ -310,6 +311,8 @@ public Response call(Map params) { List multyAssetValuesList = (List) params.get("multyAssetValues"); Object[] multyAssetValues = multyAssetValuesList != null ? multyAssetValuesList.toArray() : null; + List nulsValueToOthersList = (List) params.get("nulsValueToOthers"); + Object[] nulsValueToOthers = nulsValueToOthersList != null ? nulsValueToOthersList.toArray() : null; String remark = (String) params.get("remark"); @@ -351,8 +354,16 @@ public Response call(Map params) { } multyAssetValueList = multyAssetValueListResult.getData(); } + List nulsValueToOtherList = null; + if (nulsValueToOthers != null) { + Result> nulsValueToOtherListResult = convertNulsValueToOthers(nulsValueToOthers); + if (nulsValueToOtherListResult.isFailed()) { + return failed(nulsValueToOtherListResult.getErrorCode()); + } + nulsValueToOtherList = nulsValueToOtherListResult.getData(); + } - Result result = contractTxService.contractCallTx(chainId, sender, value, gasLimit, price, contractAddress, methodName, methodDesc, convertArgs, password, remark, multyAssetValueList); + Result result = contractTxService.contractCallTx(chainId, sender, value, gasLimit, price, contractAddress, methodName, methodDesc, convertArgs, password, remark, multyAssetValueList, nulsValueToOtherList); if (result.isFailed()) { return wrapperFailed(result); @@ -371,16 +382,31 @@ private Result> convertMultyAssetValues(Object[] mu if (convertMultyAssetValues != null && convertMultyAssetValues.length > 0) { results = new ArrayList<>(); int assetChainId, assetId; - for (String[] value : convertMultyAssetValues) { - if (value == null || value.length != 3) { + for (String[] args : convertMultyAssetValues) { + if (args == null || args.length != 3) { return Result.getFailed(PARAMETER_ERROR); } - assetChainId = Integer.parseInt(value[1]); - assetId = Integer.parseInt(value[2]); + assetChainId = Integer.parseInt(args[1]); + assetId = Integer.parseInt(args[2]); if (assetChainId <= 0 || assetId <= 0) { return Result.getFailed(PARAMETER_ERROR); } - results.add(new ProgramMultyAssetValue(new BigInteger(value[0]), assetChainId, assetId)); + results.add(new ProgramMultyAssetValue(new BigInteger(args[0]), assetChainId, assetId)); + } + } + return Result.getSuccess(results); + } + + private Result> convertNulsValueToOthers(Object[] nulsValueToOthers) { + List results = null; + String[][] convertNulsValueToOthers = ContractUtil.twoDimensionalArray(nulsValueToOthers); + if (convertNulsValueToOthers != null && convertNulsValueToOthers.length > 0) { + results = new ArrayList<>(); + for (String[] args : convertNulsValueToOthers) { + if (args == null || args.length != 2) { + return Result.getFailed(PARAMETER_ERROR); + } + results.add(new AccountAmountDto(new BigInteger(args[0].trim()), args[1].trim())); } } return Result.getSuccess(results); @@ -779,7 +805,7 @@ public Response transfer(Map params) { Result result = contractTxService.contractCallTx(chainId, sender, value, gasLimit, CONTRACT_MINIMUM_PRICE, contractAddress, BALANCE_TRIGGER_METHOD_NAME, VOID_METHOD_DESC, - null, password, remark, null); + null, password, remark, null, null); if (result.isFailed()) { return wrapperFailed(result); } @@ -862,7 +888,7 @@ public Response tokenTransfer(Map params) { Result result = contractTxService.contractCallTx(chainId, from, BigInteger.ZERO, gasLimit, CONTRACT_MINIMUM_PRICE, contractAddress, ContractConstant.NRC20_METHOD_TRANSFER, null, - ContractUtil.twoDimensionalArray(argsObj), password, remark, null); + ContractUtil.twoDimensionalArray(argsObj), password, remark, null, null); if (result.isFailed()) { return wrapperFailed(result); } @@ -983,6 +1009,45 @@ public Response invokeView(Map params) { } } + @CmdAnnotation(cmd = CODE_HASH, version = 1.0, description = "get code hash of contract") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "contractAddress", parameterDes = "合约地址"), + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "code hash(Keccak256)") + })) + public Response codeHash(Map params) { + try { + Integer chainId = (Integer) params.get("chainId"); + ChainManager.chainHandle(chainId); + String contractAddress = (String) params.get("contractAddress"); + + if (!AddressTool.validAddress(chainId, contractAddress)) { + return failed(ADDRESS_ERROR); + } + byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); + if (!ContractLedgerUtil.isExistContractAddress(chainId, contractAddressBytes)) { + return failed(CONTRACT_ADDRESS_NOT_EXIST); + } + BlockHeader blockHeader = BlockCall.getLatestBlockHeader(chainId); + // 当前区块状态根 + byte[] prevStateRoot = ContractUtil.getStateRoot(blockHeader); + byte[] codeHash = contractHelper.getContractCodeHash(chainId, prevStateRoot, contractAddressBytes); + if (codeHash == null) { + Result result = Result.getFailed(ContractErrorCode.DATA_NOT_FOUND); + return wrapperFailed(result); + } else { + Map resultMap = MapUtil.createLinkedHashMap(2); + resultMap.put("result", HexUtil.encode(codeHash)); + return success(resultMap); + } + } catch (Exception e) { + Log.error(e); + return failed(e.getMessage()); + } + } + @CmdAnnotation(cmd = CONSTRUCTOR, version = 1.0, description = "contract code constructor") @Parameters(description = "参数", value = { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractService.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractService.java index a8bd00795e..41c75a1713 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractService.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractService.java @@ -55,6 +55,9 @@ public interface ContractService { Result invokeContractOneByOneV8(int chainId, ContractTempTransaction tx); + // add by pierre at 2022/6/2 p14 + Result invokeContractOneByOneV14(int chainId, ContractTempTransaction tx); + Result saveContractExecuteResult(int chainId, NulsHash hash, ContractResult contractResult); Result deleteContractExecuteResult(int chainId, NulsHash hash); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java index 0fd0c92253..9ea27d63a7 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java @@ -25,6 +25,7 @@ import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.vm.program.ProgramMultyAssetValue; import io.nuls.core.basic.Result; @@ -44,7 +45,7 @@ Result contractCreateTx(int chainId, String sender, String alias, Long gasLimit, Result validateContractCreateTx(int chainId, byte[] sender, Long gasLimit, Long price, byte[] contractCode, String[][] args); Result contractCallTx(int chainId, String sender, BigInteger value, Long gasLimit, Long price, String contractAddress, - String methodName, String methodDesc, String[][] args, String password, String remark, List multyAssetValues); + String methodName, String methodDesc, String[][] args, String password, String remark, List multyAssetValues, List nulsValueToOtherList); Result validateContractCallTx(int chainId, byte[] senderBytes, BigInteger value, Long gasLimit, Long price, byte[] contractAddressBytes, String methodName, String methodDesc, String[][] args, List multyAssetValues); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java index c86df55c17..c0028619b7 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java @@ -64,10 +64,10 @@ public class ContractCallerImpl implements ContractCaller { static { int threadCount = 4; // 线程数最大4个，线程核心小于4时，使用线程核心数 - int availableProcessors = Runtime.getRuntime().availableProcessors(); - if(availableProcessors < threadCount) { - threadCount = availableProcessors; - } + //int availableProcessors = Runtime.getRuntime().availableProcessors(); + //if(availableProcessors < threadCount) { + // threadCount = availableProcessors; + //} TX_EXECUTOR_SERVICE = new ThreadPoolExecutor( threadCount, diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java index a2156b1289..ad1af3211d 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java @@ -23,7 +23,6 @@ */ package io.nuls.contract.service.impl; -import io.nuls.base.basic.AddressTool; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.helper.ContractTxHelper; @@ -39,9 +38,6 @@ import io.nuls.core.crypto.HexUtil; import java.math.BigInteger; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; /** * @author: PierreLuo @@ -154,6 +150,8 @@ public ContractResult call(ProgramExecutor executor, ContractData call, long num contractResult.setInvokeRegisterCmds(programResult.getInvokeRegisterCmds()); contractResult.setOrderedInnerTxs(programResult.getOrderedInnerTxs()); contractResult.setContractAddressInnerCallSet(contractTxHelper.generateInnerCallSet(programResult.getInternalCalls())); + // add by pierre at 2022/6/2 p14 + contractResult.setProgramInternalCreates(programResult.getInternalCreates()); contractResult.setAccounts(programResult.getAccounts()); return contractResult; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java index 201b434b60..6eb012af57 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java @@ -28,6 +28,7 @@ import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; +import io.nuls.contract.callable.ContractTxCallableV14; import io.nuls.contract.callable.ContractTxCallableV8; import io.nuls.contract.constant.ContractErrorCode; import io.nuls.contract.enums.CmdRegisterMode; @@ -262,6 +263,43 @@ public Result invokeContractOneByOneV8(int chainId, ContractTempTransaction tx) } } + @Override + public Result invokeContractOneByOneV14(int chainId, ContractTempTransaction tx) { + // add by pierre at 2022/6/2 p14 + try { + Log.info("[Invoke Contract] TxType is [{}], hash is [{}]", tx.getType(), tx.getHash().toString()); + tx.setChainId(chainId); + ContractWrapperTransaction wrapperTx = ContractUtil.parseContractTransaction(tx, chainManager); + if (wrapperTx == null) { + return getSuccess(); + } + Chain chain = contractHelper.getChain(chainId); + BatchInfoV8 batchInfo = chain.getBatchInfoV8(); + wrapperTx.setOrder(batchInfo.getAndIncreaseTxCounter()); + // 验证合约交易 + Result validResult = this.validContractTx(chainId, tx); + if (validResult.isFailed()) { + return validResult; + } + String preStateRoot = batchInfo.getPreStateRoot(); + ProgramExecutor batchExecutor = batchInfo.getBatchExecutor(); + // 执行合约 + Result result = callTxV14(chainId, batchExecutor, wrapperTx, preStateRoot, batchInfo); + if (result.isSuccess()) { + Map _result = new HashMap<>(); + Map map = (Map) result.getData(); + _result.put("success", map.get("success")); + _result.put("gasUsed", map.get("gasUsed")); + _result.put("txList", map.get("txList")); + return result.setData(_result); + } + return result; + } catch (NulsException e) { + Log.error(e); + return Result.getFailed(e.getErrorCode() == null ? FAILED : e.getErrorCode()); + } + } + protected Result callTx(int chainId, ProgramExecutor batchExecutor, ContractWrapperTransaction tx, String preStateRoot, BatchInfoV8 batchInfo) { try { ContractData contractData = tx.getContractData(); @@ -284,6 +322,28 @@ protected Result callTx(int chainId, ProgramExecutor batchExecutor, ContractWrap } } + protected Result callTxV14(int chainId, ProgramExecutor batchExecutor, ContractWrapperTransaction tx, String preStateRoot, BatchInfoV8 batchInfo) { + try { + ContractData contractData = tx.getContractData(); + Integer blockType = Chain.currentThreadBlockType(); + byte[] contractAddressBytes = contractData.getContractAddress(); + String contract = AddressTool.getStringAddressByBytes(contractAddressBytes); + BlockHeader currentBlockHeader = batchInfo.getCurrentBlockHeader(); + long blockTime = currentBlockHeader.getTime(); + long lastestHeight = currentBlockHeader.getHeight() - 1; + ContractTxCallableV14 txCallable = new ContractTxCallableV14(chainId, blockType, blockTime, batchExecutor, contract, tx, lastestHeight, preStateRoot); + ContractResult contractResult = txCallable.call(); + batchInfo.getContractResultMap().put(tx.getHash().toString(), contractResult); + // 提取需要返回的结果数据 + Map result = this.extractDataFromContractResult(contractResult); + batchInfo.getOfflineTxHashList().addAll((List)result.get("txHashList")); + return getSuccess().setData(result); + } catch (Exception e) { + Log.error(e); + return getFailed(); + } + } + protected Map extractDataFromContractResult(ContractResult contractResult) throws IOException { List offlineTxHashList = new ArrayList<>(); List resultTxList = new ArrayList<>(); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java index d62fe92acf..54abef56dd 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java @@ -32,6 +32,7 @@ import io.nuls.contract.helper.ContractTxHelper; import io.nuls.contract.manager.ContractTokenBalanceManager; import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.model.po.ContractAddressInfoPo; import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.tx.CallContractTransaction; @@ -122,9 +123,9 @@ public Result validateContractCreateTx(int chainId, byte[] sender, Long gasLimit @Override public Result contractCallTx(int chainId, String sender, BigInteger value, Long gasLimit, Long price, String contractAddress, String methodName, String methodDesc, String[][] args, - String password, String remark, List multyAssetValues) { + String password, String remark, List multyAssetValues, List nulsValueToOtherList) { try { - Result result = contractTxHelper.makeCallTx(chainId, sender, value, gasLimit, price, contractAddress, methodName, methodDesc, args, password, remark, multyAssetValues); + Result result = contractTxHelper.makeCallTx(chainId, sender, value, gasLimit, price, contractAddress, methodName, methodDesc, args, password, remark, multyAssetValues, nulsValueToOtherList); if (result.isFailed()) { return result; } @@ -138,12 +139,12 @@ public Result contractCallTx(int chainId, String sender, BigInteger value, Long return signAndBroadcastTxResult; } - // 保存未确认Token转账 + /*// 保存未确认Token转账 Result unConfirmedTokenTransferResult = this.saveUnConfirmedTokenTransfer(chainId, tx, sender, contractAddress, methodName, args); if (unConfirmedTokenTransferResult.isFailed()) { return unConfirmedTokenTransferResult; } - byte[] infoKey = unConfirmedTokenTransferResult.getData(); + byte[] infoKey = unConfirmedTokenTransferResult.getData();*/ Map resultMap = new HashMap<>(2); resultMap.put("txHash", tx.getHash().toHex()); @@ -168,6 +169,7 @@ public Result previewContractCallTx(int chainId, byte[] senderBy return contractTxHelper.previewCall(chainId, senderBytes, contractAddressBytes, value, gasLimit, price, methodName, methodDesc, args, multyAssetValues); } + @Deprecated private Result saveUnConfirmedTokenTransfer(int chainId, CallContractTransaction tx, String sender, String contractAddress, String methodName, String[][] args) { try { ContractTokenBalanceManager tokenBalanceManager = contractHelper.getChain(chainId).getContractTokenBalanceManager(); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java index 409786553c..8c6cf8779b 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java @@ -33,6 +33,7 @@ public static SmartContractVersionChangeInvoker instance() { } private boolean isloadV8 = false; + private boolean isloadV14 = false; /** * @@ -46,7 +47,9 @@ public void process(int currentChainId) { Short currentVersion = ProtocolGroupManager.getCurrentVersion(currentChainId); Log.info("触发协议升级，chainId: [{}], 版本为: [{}]", currentChainId, currentVersion); ChainManager chainManager = SpringLiteContext.getBean(ChainManager.class); - if (currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { + if (currentVersion >= ContractContext.PROTOCOL_14) { + this.loadV14(chainManager.getChainMap().get(currentChainId), currentVersion); + } else if (currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { this.loadV8(chainManager.getChainMap().get(currentChainId), currentVersion); } // 向交易模块设置智能合约生成交易类型 @@ -107,4 +110,14 @@ private void loadV8(Chain chain, int currentVersion) { VMFactory.reInitVM_v8(); isloadV8 = true; } + + private void loadV14(Chain chain, int currentVersion) { + if (isloadV14) { + return; + } + chain.clearBatchInfo(); + Log.info("版本[{}]协议升级成功，重新初始化智能合约VM", currentVersion); + VMFactory.reInitVM_v14(); + isloadV14 = true; + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java new file mode 100644 index 0000000000..f3d975c1eb --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java @@ -0,0 +1,130 @@ +package io.nuls.contract.tx.v13; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.contract.config.ContractContext; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.model.bo.BatchInfoV8; +import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.bo.ContractWrapperTransaction; +import io.nuls.contract.model.tx.CallContractTransaction; +import io.nuls.contract.model.txdata.CallContractData; +import io.nuls.contract.processor.CallContractTxProcessor; +import io.nuls.contract.util.ContractUtil; +import io.nuls.contract.util.Log; +import io.nuls.contract.validator.CallContractTxValidator; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component("CallContractProcessorV13") +public class CallContractProcessorV13 implements TransactionProcessor { + + @Autowired + private CallContractTxProcessor callContractTxProcessor; + @Autowired + private CallContractTxValidator callContractTxValidator; + @Autowired + private ContractHelper contractHelper; + @Autowired + private ChainManager chainManager; + + @Override + public int getType() { + return TxType.CALL_CONTRACT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + ChainManager.chainHandle(chainId); + Map result = new HashMap<>(); + List errorList = new ArrayList<>(); + result.put("txList", errorList); + String errorCode = null; + CallContractTransaction callTx; + for(Transaction tx : txs) { + callTx = new CallContractTransaction(); + callTx.copyTx(tx); + try { + Result validate = callContractTxValidator.validateV13(chainId, callTx); + if(validate.isFailed()) { + errorCode = validate.getErrorCode().getCode(); + errorList.add(tx); + } + } catch (NulsException e) { + Log.error(e); + errorCode = e.getErrorCode().getCode(); + errorList.add(tx); + } + } + result.put("errorCode", errorCode); + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader header) { + try { + BatchInfoV8 batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); + if (batchInfo != null) { + Map contractResultMap = batchInfo.getContractResultMap(); + ContractResult contractResult; + ContractWrapperTransaction wrapperTx; + String txHash; + for (Transaction tx : txs) { + txHash = tx.getHash().toString(); + contractResult = contractResultMap.get(txHash); + if (contractResult == null) { + Log.warn("empty contract result with txHash: {}, txType: {}", txHash, tx.getType()); + continue; + } + wrapperTx = contractResult.getTx(); + wrapperTx.setContractResult(contractResult); + callContractTxProcessor.onCommitV8(chainId, wrapperTx); + } + } + + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + ChainManager.chainHandle(chainId); + CallContractData call; + for (Transaction tx : txs) { + if (tx.getType() == TxType.CROSS_CHAIN) { + // add by pierre at 2019-12-01 处理type10交易的业务回滚, 需要协议升级 done + if(ProtocolGroupManager.getCurrentVersion(chainId) < ContractContext.UPDATE_VERSION_V250) { + continue; + } + call = ContractUtil.parseCrossChainTx(tx, chainManager); + if (call == null) { + continue; + } + } else { + call = new CallContractData(); + call.parse(tx.getTxData(), 0); + } + callContractTxProcessor.onRollbackV8(chainId, new ContractWrapperTransaction(tx, call)); + } + return true; + } catch (NulsException e) { + Log.error(e); + return false; + } + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java new file mode 100644 index 0000000000..3df99e2629 --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java @@ -0,0 +1,127 @@ +package io.nuls.contract.tx.v14; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.contract.config.ContractContext; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.model.bo.BatchInfoV8; +import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.bo.ContractWrapperTransaction; +import io.nuls.contract.model.tx.CallContractTransaction; +import io.nuls.contract.model.txdata.CallContractData; +import io.nuls.contract.processor.CallContractTxProcessor; +import io.nuls.contract.util.ContractUtil; +import io.nuls.contract.util.Log; +import io.nuls.contract.validator.CallContractTxValidator; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +// add by pierre at 2022/6/2 p14 +@Component("CallContractProcessorV14") +public class CallContractProcessorV14 implements TransactionProcessor { + + @Autowired + private CallContractTxProcessor callContractTxProcessor; + @Autowired + private CallContractTxValidator callContractTxValidator; + @Autowired + private ContractHelper contractHelper; + @Autowired + private ChainManager chainManager; + + @Override + public int getType() { + return TxType.CALL_CONTRACT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + ChainManager.chainHandle(chainId); + Map result = new HashMap<>(); + List errorList = new ArrayList<>(); + result.put("txList", errorList); + String errorCode = null; + CallContractTransaction callTx; + for(Transaction tx : txs) { + callTx = new CallContractTransaction(); + callTx.copyTx(tx); + try { + Result validate = callContractTxValidator.validateV14(chainId, callTx); + if(validate.isFailed()) { + errorCode = validate.getErrorCode().getCode(); + errorList.add(tx); + } + } catch (NulsException e) { + Log.error(e); + errorCode = e.getErrorCode().getCode(); + errorList.add(tx); + } + } + result.put("errorCode", errorCode); + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader header) { + try { + BatchInfoV8 batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); + if (batchInfo != null) { + Map contractResultMap = batchInfo.getContractResultMap(); + ContractResult contractResult; + ContractWrapperTransaction wrapperTx; + String txHash; + for (Transaction tx : txs) { + txHash = tx.getHash().toString(); + contractResult = contractResultMap.get(txHash); + if (contractResult == null) { + Log.warn("empty contract result with txHash: {}, txType: {}", txHash, tx.getType()); + continue; + } + wrapperTx = contractResult.getTx(); + wrapperTx.setContractResult(contractResult); + callContractTxProcessor.onCommitV14(chainId, wrapperTx); + } + } + + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + ChainManager.chainHandle(chainId); + CallContractData call; + for (Transaction tx : txs) { + if (tx.getType() == TxType.CROSS_CHAIN) { + call = ContractUtil.parseCrossChainTx(tx, chainManager); + if (call == null) { + continue; + } + } else { + call = new CallContractData(); + call.parse(tx.getTxData(), 0); + } + callContractTxProcessor.onRollbackV14(chainId, new ContractWrapperTransaction(tx, call)); + } + return true; + } catch (NulsException e) { + Log.error(e); + return false; + } + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java new file mode 100644 index 0000000000..1a22990828 --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java @@ -0,0 +1,115 @@ +package io.nuls.contract.tx.v14; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.model.bo.BatchInfoV8; +import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.bo.ContractWrapperTransaction; +import io.nuls.contract.model.tx.CreateContractTransaction; +import io.nuls.contract.model.txdata.CreateContractData; +import io.nuls.contract.processor.CreateContractTxProcessor; +import io.nuls.contract.util.Log; +import io.nuls.contract.validator.CreateContractTxValidator; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +// add by pierre at 2022/6/6 p14 +@Component("CreateContractProcessorV14") +public class CreateContractProcessorV14 implements TransactionProcessor { + + @Autowired + private CreateContractTxProcessor createContractTxProcessor; + @Autowired + private CreateContractTxValidator createContractTxValidator; + @Autowired + private ContractHelper contractHelper; + + @Override + public int getType() { + return TxType.CREATE_CONTRACT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + ChainManager.chainHandle(chainId); + Map result = new HashMap<>(); + List errorList = new ArrayList<>(); + result.put("txList", errorList); + String errorCode = null; + CreateContractTransaction createTx; + for(Transaction tx : txs) { + createTx = new CreateContractTransaction(); + createTx.copyTx(tx); + try { + Result validate = createContractTxValidator.validate(chainId, createTx); + if(validate.isFailed()) { + errorCode = validate.getErrorCode().getCode(); + errorList.add(tx); + } + } catch (NulsException e) { + Log.error(e); + errorCode = e.getErrorCode().getCode(); + errorList.add(tx); + } + } + result.put("errorCode", errorCode); + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader header) { + try { + BatchInfoV8 batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); + if (batchInfo != null) { + Map contractResultMap = batchInfo.getContractResultMap(); + ContractResult contractResult; + ContractWrapperTransaction wrapperTx; + String txHash; + for (Transaction tx : txs) { + txHash = tx.getHash().toString(); + contractResult = contractResultMap.get(txHash); + if (contractResult == null) { + Log.warn("empty contract result with txHash: {}", txHash); + continue; + } + wrapperTx = contractResult.getTx(); + wrapperTx.setContractResult(contractResult); + createContractTxProcessor.onCommitV14(chainId, wrapperTx); + } + } + + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + ChainManager.chainHandle(chainId); + CreateContractData create; + for (Transaction tx : txs) { + create = new CreateContractData(); + create.parse(tx.getTxData(), 0); + createContractTxProcessor.onRollbackV14(chainId, new ContractWrapperTransaction(tx, create)); + } + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java index d88827489f..d1a7c37d66 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java @@ -28,6 +28,7 @@ import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.data.*; import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.base.signture.MultiSignTxSignature; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; import io.nuls.contract.config.ContractContext; @@ -35,6 +36,7 @@ import io.nuls.contract.constant.ContractErrorCode; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.model.bo.*; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.model.dto.ContractTokenTransferInfo; import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.tx.*; @@ -748,18 +750,25 @@ public static int extractTxTypeFromTx(String txString) throws NulsException { return byteBuffer.readUint16(); } - public static byte[] extractPublicKey(Transaction tx) { + public static byte[] extractPublicKey(Transaction tx) throws NulsException { if (tx.getTransactionSignature() == null) { return null; } - TransactionSignature signature = new TransactionSignature(); - try { - signature.parse(tx.getTransactionSignature(), 0); - } catch (NulsException e) { - Log.error(e); - return null; + List p2PHKSignatures; + if (tx.isMultiSignTx()) { + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.parse(tx.getTransactionSignature(), 0); + p2PHKSignatures = transactionSignature.getP2PHKSignatures(); + } else { + TransactionSignature signature = new TransactionSignature(); + try { + signature.parse(tx.getTransactionSignature(), 0); + } catch (NulsException e) { + Log.error(e); + return null; + } + p2PHKSignatures = signature.getP2PHKSignatures(); } - List p2PHKSignatures = signature.getP2PHKSignatures(); P2PHKSignature p2PHKSignature = p2PHKSignatures.get(0); byte[] publicKey = p2PHKSignature.getPublicKey(); return publicKey; @@ -862,6 +871,20 @@ public static String[][] multyAssetStringArray(ProgramMultyAssetValue[] multyAss return array; } + public static String[][] nulsValueToOthersStringArray(AccountAmountDto[] nulsValueToOthers) { + int length; + if (nulsValueToOthers == null || (length = nulsValueToOthers.length) == 0) { + return null; + } + String[][] array = new String[length][]; + AccountAmountDto dto; + for (int i = 0; i < length; i++) { + dto = nulsValueToOthers[i]; + array[i] = new String[]{dto.getValue().toString(), dto.getTo()}; + } + return array; + } + public static ProgramMultyAssetValue[] multyAssetObjectArray(String[][] multyAssetValues) { int length; if (multyAssetValues == null || (length = multyAssetValues.length) == 0) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/Log.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/Log.java index b5d1b2fea5..1652aec3a4 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/Log.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/Log.java @@ -1,10 +1,10 @@ package io.nuls.contract.util; import ch.qos.logback.classic.Level; -import com.alibaba.fastjson.JSONObject; import io.nuls.contract.constant.ContractConstant; import io.nuls.core.io.IoUtils; import io.nuls.core.log.logback.NulsLogger; +import io.nuls.core.parse.JSONUtils; import java.io.InputStream; import java.util.HashMap; @@ -191,9 +191,9 @@ private static NulsLogger getDefaultBasicLogger() { if(DEFAULT_BASIC_LOGGER == null) { try (InputStream configInput = Log.class.getClassLoader().getResourceAsStream(MODULE_CONFIG_FILE)) { String str = IoUtils.readBytesToString(configInput); - JSONObject json = JSONObject.parseObject(str); + Map json = JSONUtils.json2map(str); LogUtil.configDefaultLog(ContractConstant.LOG_FILE_NAME, - json.getString("packageLogPackages"), json.getString("packageLogLevels")); + (String) json.get("packageLogPackages"), (String) json.get("packageLogLevels")); } catch (Exception e) { LogUtil.configDefaultLog(ContractConstant.LOG_FILE_NAME); } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java index 8e9d00ba14..b03afc7bf6 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java @@ -35,6 +35,7 @@ import io.nuls.contract.model.bo.Chain; import io.nuls.contract.model.tx.CallContractTransaction; import io.nuls.contract.model.txdata.CallContractData; +import io.nuls.contract.rpc.call.AccountCall; import io.nuls.contract.util.ContractLedgerUtil; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; @@ -267,4 +268,285 @@ public Result validateV8(int chainId, CallContractTransaction tx) throws NulsExc return Result.getFailed(FEE_NOT_RIGHT); } } + + /** + * 1. 新增功能，调用合约时可以转账给其他地址 + */ + public Result validateV13(int chainId, CallContractTransaction tx) throws NulsException { + + CoinData coinData = tx.getCoinDataInstance(); + List fromList = coinData.getFrom(); + List toList = coinData.getTo(); + CallContractData txData = tx.getTxDataObj(); + byte[] sender = txData.getSender(); + + Set signatureAddressSet = SignatureUtil.getAddressFromTX(tx, chainId); + if (!signatureAddressSet.contains(AddressTool.getStringAddressByBytes(sender))) { + Log.error("contract call error: The contract caller is not the transaction signer."); + return Result.getFailed(CONTRACT_CALLER_SIGN_ERROR); + } + if (!ContractUtil.checkGasLimit(txData.getGasLimit())) { + Log.error("contract call error: The value of gas limit ranges from 0 to 10,000,000."); + return Result.getFailed(CONTRACT_GAS_LIMIT_ERROR); + } + + byte[] contractAddress = txData.getContractAddress(); + + if (!ContractLedgerUtil.isExistContractAddress(chainId, contractAddress)) { + Log.error("contract call error: The contract does not exist."); + return Result.getFailed(CONTRACT_ADDRESS_NOT_EXIST); + } + + Map multyAssetMap = new HashMap<>(); + Set multyAssetKeys = new HashSet<>(); + int assetChainId, assetId; + String assetKey; + BigInteger nulsValue = BigInteger.ZERO; + for(CoinFrom from : fromList) { + assetChainId = from.getAssetsChainId(); + assetId = from.getAssetsId(); + assetKey = assetChainId + "_" + assetId; + if (CHAIN_ID == assetChainId && ASSET_ID == assetId) { + nulsValue = nulsValue.add(from.getAmount()); + } else { + multyAssetKeys.add(assetKey); + BigInteger multyAssetValue = multyAssetMap.getOrDefault(assetKey + "from", BigInteger.ZERO); + multyAssetMap.put(assetKey + "from", multyAssetValue.add(from.getAmount())); + } + } + + int toSize = toList.size(); + BigInteger transferNulsToContractValue = txData.getValue(); + BigInteger contractReceivedNulsValue = BigInteger.ZERO; + // 调用者在调用合约的同时，向其他账户转账 + BigInteger transferNulsToOtherAccountValue = BigInteger.ZERO; + if (toSize > 0) { + for (CoinTo coin : toList) { + if (coin.getLockTime() != 0) { + Log.error("contract call error: Transfer amount cannot be locked."); + return Result.getFailed(AMOUNT_LOCK_ERROR); + } + byte[] to = coin.getAddress(); + boolean isContractReceiver = Arrays.equals(to, contractAddress); + assetChainId = coin.getAssetsChainId(); + assetId = coin.getAssetsId(); + boolean mainAsset = assetChainId == CHAIN_ID && assetId == ASSET_ID; + if (!mainAsset) { + if (coin.getAmount().compareTo(BigInteger.ZERO) == 0) { + Log.error("contract call error: Transfer amount cannot be zero."); + return Result.getFailed(TOO_SMALL_AMOUNT); + } + assetKey = assetChainId + "_" + assetId; + multyAssetKeys.add(assetKey); + BigInteger multyAssetValue = multyAssetMap.getOrDefault(assetKey + "to", BigInteger.ZERO); + multyAssetMap.put(assetKey + "to", multyAssetValue.add(coin.getAmount())); + continue; + } + if (coin.getAmount().compareTo(MININUM_TRANSFER_AMOUNT) < 0) { + Log.error("contract call error: The amount of the transfer is too small."); + return Result.getFailed(TOO_SMALL_AMOUNT); + } + if (isContractReceiver) { + contractReceivedNulsValue = contractReceivedNulsValue.add(coin.getAmount()); + } else { + // 检查to地址是否在账户白名单中 + String toStr = AddressTool.getStringAddressByBytes(to); + boolean whiteAddress = AccountCall.validationWhitelistForTransferOnContractCall(chainId, toStr); + if (!whiteAddress) { + Log.error("contract call error: The receiver is not a whitelisted address."); + return Result.getFailed(CONTRACT_COIN_TO_ERROR); + } + transferNulsToOtherAccountValue = transferNulsToOtherAccountValue.add(coin.getAmount()); + } + } + + } + + // 其他资产校验 + BigInteger assetKeyFrom, assetKeyTo; + for (String multyAssetKey : multyAssetKeys) { + assetKeyFrom = multyAssetMap.get(multyAssetKey + "from"); + assetKeyTo = multyAssetMap.get(multyAssetKey + "to"); + if(null == assetKeyFrom){ + Log.error("contract call error: Illegal coinFrom in the contract."); + return Result.getFailed(CONTRACT_COIN_FROM_ERROR); + } + if (null == assetKeyTo) { + Log.error("contract call error: Illegal coinTo in the contract."); + return Result.getFailed(CONTRACT_COIN_TO_ERROR); + } + if (!BigIntegerUtils.isEqual(assetKeyFrom, assetKeyTo)) { + Log.error("contract call error: The amount of coin data is error."); + return Result.getFailed(CONTRACT_COIN_ASSETS_ERROR); + } + } + + // 主资产校验 + if (contractReceivedNulsValue.compareTo(transferNulsToContractValue) < 0) { + Log.error("contract call error: Insufficient balance of nuls to transfer to the contract address."); + return Result.getFailed(INSUFFICIENT_BALANCE_TO_CONTRACT); + } + + if (transferNulsToContractValue.compareTo(BigInteger.ZERO) > 0) { + // 手续费账户也能支出，向合约转资产 + if (nulsValue.compareTo(transferNulsToContractValue.add(transferNulsToOtherAccountValue)) < 0) { + Log.error("contract call error: Insufficient balance to transfer to the contract address."); + return Result.getFailed(INSUFFICIENT_BALANCE_TO_CONTRACT); + } + } + + BigInteger realFee = coinData.getFeeByAsset(CHAIN_ID, ASSET_ID); + BigInteger fee = TransactionFeeCalculator.getNormalTxFee(tx.size()).add(BigInteger.valueOf(txData.getGasLimit()).multiply(BigInteger.valueOf(txData.getPrice()))); + if (realFee.compareTo(fee) >= 0) { + return getSuccess(); + } else { + Log.error("contract call error: The contract transaction fee is not right."); + return Result.getFailed(FEE_NOT_RIGHT); + } + } + /** + * 1. 新增功能，调用合约时支持多签地址 + */ + public Result validateV14(int chainId, CallContractTransaction tx) throws NulsException { + + CoinData coinData = tx.getCoinDataInstance(); + List fromList = coinData.getFrom(); + List toList = coinData.getTo(); + CallContractData txData = tx.getTxDataObj(); + byte[] sender = txData.getSender(); + + if (fromList == null || fromList.isEmpty()) { + Log.error("contract call error: The contract caller is not the transaction signer.[0]"); + return Result.getFailed(CONTRACT_CALLER_SIGN_ERROR); + } + boolean existSender = false; + for (CoinFrom from : fromList) { + if (Arrays.equals(from.getAddress(), sender)) { + existSender = true; + break; + } + } + if (!existSender) { + Log.error("contract call error: The contract caller is not the transaction signer.[1]"); + return Result.getFailed(CONTRACT_CALLER_SIGN_ERROR); + } + if (!ContractUtil.checkGasLimit(txData.getGasLimit())) { + Log.error("contract call error: The value of gas limit ranges from 0 to 10,000,000."); + return Result.getFailed(CONTRACT_GAS_LIMIT_ERROR); + } + + byte[] contractAddress = txData.getContractAddress(); + + if (!ContractLedgerUtil.isExistContractAddress(chainId, contractAddress)) { + Log.error("contract call error: The contract does not exist."); + return Result.getFailed(CONTRACT_ADDRESS_NOT_EXIST); + } + + Map multyAssetMap = new HashMap<>(); + Set multyAssetKeys = new HashSet<>(); + int assetChainId, assetId; + String assetKey; + BigInteger nulsValue = BigInteger.ZERO; + for(CoinFrom from : fromList) { + assetChainId = from.getAssetsChainId(); + assetId = from.getAssetsId(); + assetKey = assetChainId + "_" + assetId; + if (CHAIN_ID == assetChainId && ASSET_ID == assetId) { + nulsValue = nulsValue.add(from.getAmount()); + } else { + multyAssetKeys.add(assetKey); + BigInteger multyAssetValue = multyAssetMap.getOrDefault(assetKey + "from", BigInteger.ZERO); + multyAssetMap.put(assetKey + "from", multyAssetValue.add(from.getAmount())); + } + } + + int toSize = toList.size(); + BigInteger transferNulsToContractValue = txData.getValue(); + BigInteger contractReceivedNulsValue = BigInteger.ZERO; + // 调用者在调用合约的同时，向其他账户转账 + BigInteger transferNulsToOtherAccountValue = BigInteger.ZERO; + if (toSize > 0) { + for (CoinTo coin : toList) { + if (coin.getLockTime() != 0) { + Log.error("contract call error: Transfer amount cannot be locked."); + return Result.getFailed(AMOUNT_LOCK_ERROR); + } + byte[] to = coin.getAddress(); + boolean isContractReceiver = Arrays.equals(to, contractAddress); + assetChainId = coin.getAssetsChainId(); + assetId = coin.getAssetsId(); + boolean mainAsset = assetChainId == CHAIN_ID && assetId == ASSET_ID; + if (!mainAsset) { + if (coin.getAmount().compareTo(BigInteger.ZERO) == 0) { + Log.error("contract call error: Transfer amount cannot be zero."); + return Result.getFailed(TOO_SMALL_AMOUNT); + } + assetKey = assetChainId + "_" + assetId; + multyAssetKeys.add(assetKey); + BigInteger multyAssetValue = multyAssetMap.getOrDefault(assetKey + "to", BigInteger.ZERO); + multyAssetMap.put(assetKey + "to", multyAssetValue.add(coin.getAmount())); + continue; + } + if (coin.getAmount().compareTo(MININUM_TRANSFER_AMOUNT) < 0) { + Log.error("contract call error: The amount of the transfer is too small."); + return Result.getFailed(TOO_SMALL_AMOUNT); + } + if (isContractReceiver) { + contractReceivedNulsValue = contractReceivedNulsValue.add(coin.getAmount()); + } else { + // 检查to地址是否在账户白名单中 + String toStr = AddressTool.getStringAddressByBytes(to); + boolean whiteAddress = AccountCall.validationWhitelistForTransferOnContractCall(chainId, toStr); + if (!whiteAddress) { + Log.error("contract call error: The receiver is not a whitelisted address."); + return Result.getFailed(CONTRACT_COIN_TO_ERROR); + } + transferNulsToOtherAccountValue = transferNulsToOtherAccountValue.add(coin.getAmount()); + } + } + + } + + // 其他资产校验 + BigInteger assetKeyFrom, assetKeyTo; + for (String multyAssetKey : multyAssetKeys) { + assetKeyFrom = multyAssetMap.get(multyAssetKey + "from"); + assetKeyTo = multyAssetMap.get(multyAssetKey + "to"); + if(null == assetKeyFrom){ + Log.error("contract call error: Illegal coinFrom in the contract."); + return Result.getFailed(CONTRACT_COIN_FROM_ERROR); + } + if (null == assetKeyTo) { + Log.error("contract call error: Illegal coinTo in the contract."); + return Result.getFailed(CONTRACT_COIN_TO_ERROR); + } + if (!BigIntegerUtils.isEqual(assetKeyFrom, assetKeyTo)) { + Log.error("contract call error: The amount of coin data is error."); + return Result.getFailed(CONTRACT_COIN_ASSETS_ERROR); + } + } + + // 主资产校验 + if (contractReceivedNulsValue.compareTo(transferNulsToContractValue) < 0) { + Log.error("contract call error: Insufficient balance of nuls to transfer to the contract address."); + return Result.getFailed(INSUFFICIENT_BALANCE_TO_CONTRACT); + } + + if (transferNulsToContractValue.compareTo(BigInteger.ZERO) > 0) { + // 手续费账户也能支出，向合约转资产 + if (nulsValue.compareTo(transferNulsToContractValue.add(transferNulsToOtherAccountValue)) < 0) { + Log.error("contract call error: Insufficient balance to transfer to the contract address."); + return Result.getFailed(INSUFFICIENT_BALANCE_TO_CONTRACT); + } + } + + BigInteger realFee = coinData.getFeeByAsset(CHAIN_ID, ASSET_ID); + BigInteger fee = TransactionFeeCalculator.getNormalTxFee(tx.size()).add(BigInteger.valueOf(txData.getGasLimit()).multiply(BigInteger.valueOf(txData.getPrice()))); + if (realFee.compareTo(fee) >= 0) { + return getSuccess(); + } else { + Log.error("contract call error: The contract transaction fee is not right."); + return Result.getFailed(FEE_NOT_RIGHT); + } + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/GasCost.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/GasCost.java index 41486b6986..cb0079f2b9 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/GasCost.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/GasCost.java @@ -54,5 +54,7 @@ public class GasCost { * 调用虚拟机外部方法(其他模块注册的方法) */ public static final int INVOKE_EXTERNAL_METHOD = 5000; + public static final int CREATE_PER_BYTE = 7; + public static final int OBJ_TO_JSON_PER_CHAR = 4; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java index 3a7b230410..c1cadff76e 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java @@ -25,7 +25,6 @@ package io.nuls.contract.vm; import io.nuls.contract.model.dto.BlockHeaderDto; -import io.nuls.contract.util.Log; import io.nuls.contract.util.VMContext; import io.nuls.contract.vm.code.MethodCode; import io.nuls.contract.vm.code.VariableType; @@ -124,6 +123,13 @@ public class VM { // add by pierre at 2020-11-03 可能影响兼容性，考虑协议升级 private LinkedList stackTraces = new LinkedList<>(); + // add by pierre at 2022/6/1 p14 + private List internalCreates = new ArrayList<>(); + + public List getInternalCreates() { + return internalCreates; + } + public LinkedList getStackTraces() { return stackTraces; } @@ -226,22 +232,12 @@ public void run(MethodCode methodCode, Object[] args, boolean pushResult) { public void run(ObjectRef objectRef, MethodCode methodCode, VMContext vmContext, ProgramInvoke programInvoke) { this.vmContext = vmContext; - //todo Niels - long startTime = System.nanoTime(); Object[] runArgs = runArgs(objectRef, methodCode, programInvoke.getArgs()); - long use = System.nanoTime()-startTime; - Log.info("===================================================================step 1.1 : {}ns",use); - startTime = System.nanoTime(); if (isEnd()) { return; } initProgramContext(programInvoke); - use = System.nanoTime()-startTime; - Log.info("===================================================================step 1.2 : {}ns",use); - startTime = System.nanoTime(); run(methodCode, runArgs, true); - use = System.nanoTime()-startTime; - Log.info("===================================================================step 1.3 : {}ns",use); } private Object[] runArgs(ObjectRef objectRef, MethodCode methodCode, String[][] args) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java index c6f39c1547..367d04b0be 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java @@ -27,11 +27,9 @@ import io.nuls.contract.vm.code.ClassCode; import io.nuls.contract.vm.code.ClassCodeLoader; import io.nuls.contract.vm.program.impl.ProgramConstants; +import org.apache.commons.lang3.ArrayUtils; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.CountDownLatch; public class VMFactory { @@ -290,12 +288,12 @@ public class VMFactory { Heap.INIT_ARRAYS.putAll(VM.heap.arrays); } - private static volatile CountDownLatch waitV8; + private static volatile CountDownLatch waitCreate; public static VM createVM() { - if (waitV8 != null) { + if (waitCreate != null) { try { - waitV8.await(); + waitCreate.await(); } catch (InterruptedException e) { //nothing } @@ -315,7 +313,7 @@ private static VM initVM() { } public static void reInitVM_v8() { - waitV8 = new CountDownLatch(1); + waitCreate = new CountDownLatch(1); MethodArea.INIT_CLASS_CODES.clear(); MethodArea.INIT_METHOD_CODES.clear(); Heap.INIT_OBJECTS.clear(); @@ -327,7 +325,23 @@ public static void reInitVM_v8() { MethodArea.INIT_METHOD_CODES.putAll(VM.methodArea.getMethodCodes()); Heap.INIT_OBJECTS.putAll(VM.heap.objects); Heap.INIT_ARRAYS.putAll(VM.heap.arrays); - waitV8.countDown(); + waitCreate.countDown(); + } + + public static void reInitVM_v14() { + waitCreate = new CountDownLatch(1); + MethodArea.INIT_CLASS_CODES.clear(); + MethodArea.INIT_METHOD_CODES.clear(); + Heap.INIT_OBJECTS.clear(); + Heap.INIT_ARRAYS.clear(); + + VM = loadVM_v14(); + + MethodArea.INIT_CLASS_CODES.putAll(VM.methodArea.getClassCodes()); + MethodArea.INIT_METHOD_CODES.putAll(VM.methodArea.getMethodCodes()); + Heap.INIT_OBJECTS.putAll(VM.heap.objects); + Heap.INIT_ARRAYS.putAll(VM.heap.arrays); + waitCreate.countDown(); } private static VM loadVM_v8() { @@ -338,19 +352,45 @@ private static VM loadVM_v8() { classCodes.put(classCode.name, classCode); } // v8 add - List list = new ArrayList<>(); - list.add("io/nuls/contract/sdk/annotation/PayableMultyAsset"); - list.add("io/nuls/contract/sdk/MultyAssetValue"); - for (String className : list) { + //List list = new ArrayList<>(); + //list.add("io/nuls/contract/sdk/annotation/PayableMultyAsset"); + //list.add("io/nuls/contract/sdk/MultyAssetValue"); + for (String className : ProgramConstants.SDK_CLASS_NAMES_V8_ADD) { ClassCode classCode = ClassCodeLoader.loadFromResource_v8(className); classCodes.put(classCode.name, classCode); } vm.methodArea.loadClassCodes(classCodes); + ProgramConstants.SDK_CLASS_NAMES = ArrayUtils.addAll(ProgramConstants.SDK_CLASS_NAMES, ProgramConstants.SDK_CLASS_NAMES_V8_ADD); + return vm; + } - ProgramConstants.SDK_CLASS_NAMES = new String[ProgramConstants.SDK_CLASSES_V8.length]; - for (int i = 0; i < ProgramConstants.SDK_CLASSES_V8.length; i++) { - ProgramConstants.SDK_CLASS_NAMES[i] = ProgramConstants.classNameReplace(ProgramConstants.SDK_CLASSES_V8[i].getName()); + private static VM loadVM_v14() { + VM vm = new VM(); + Map classCodes = new LinkedHashMap<>(1024); + for (String className : CLINIT_CLASSES) { + ClassCode classCode = ClassCodeLoader.loadFromResource_v14(className); + classCodes.put(classCode.name, classCode); + } + // v8 add + //List list = new ArrayList<>(); + //list.add("io/nuls/contract/sdk/annotation/PayableMultyAsset"); + //list.add("io/nuls/contract/sdk/MultyAssetValue"); + //// v14 add + //list.add("io/nuls/contract/sdk/token/AssetWrapper"); + //list.add("io/nuls/contract/sdk/token/NRC20Wrapper"); + //list.add("io/nuls/contract/sdk/token/Token"); + for (String className : ProgramConstants.SDK_CLASS_NAMES_V8_ADD) { + ClassCode classCode = ClassCodeLoader.loadFromResource_v14(className); + classCodes.put(classCode.name, classCode); + } + for (String className : ProgramConstants.SDK_CLASS_NAMES_V14_ADD) { + ClassCode classCode = ClassCodeLoader.loadFromResource_v14(className); + classCodes.put(classCode.name, classCode); } + vm.methodArea.loadClassCodes(classCodes); + + ProgramConstants.SDK_CLASS_NAMES = ArrayUtils.addAll(ProgramConstants.SDK_CLASS_NAMES, ProgramConstants.SDK_CLASS_NAMES_V8_ADD); + ProgramConstants.SDK_CLASS_NAMES = ArrayUtils.addAll(ProgramConstants.SDK_CLASS_NAMES, ProgramConstants.SDK_CLASS_NAMES_V14_ADD); return vm; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java index 7d8109476f..0313d68ba8 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java @@ -51,9 +51,10 @@ import java.util.jar.JarInputStream; public class ClassCodeLoader { - + private static final Map BASE_USED_CLASSES; private static final Map RESOURCE_CLASS_CODES; private static final Map RESOURCE_CLASS_CODES_V8; + private static final Map RESOURCE_CLASS_CODES_V14; private static final LoadingCache> CACHE; @@ -68,8 +69,10 @@ public Map load(@Nonnull final ClassCodeCacheKey cacheKey) { return ClassCodeLoader.loadJar(cacheKey.getBytes()); } }); + BASE_USED_CLASSES = loadBaseFromResource(); RESOURCE_CLASS_CODES = loadFromResource(); RESOURCE_CLASS_CODES_V8 = loadFromResource_v8(); + RESOURCE_CLASS_CODES_V14 = loadFromResource_v14(); } public static ClassCode load(String className) { @@ -99,7 +102,19 @@ public static ClassCode loadFromResource_v8(String className) { } } + public static ClassCode loadFromResource_v14(String className) { + ClassCode classCode = RESOURCE_CLASS_CODES_V14.get(className); + if (classCode == null) { + throw new RuntimeException("can't load class " + className); + } else { + return classCode; + } + } + public static ClassCode getFromResource(String className) { + if (ProtocolGroupManager.getCurrentVersion(ContractContext.CHAIN_ID) >= ContractContext.PROTOCOL_14) { + return RESOURCE_CLASS_CODES_V14.get(className); + } if (ProtocolGroupManager.getCurrentVersion(ContractContext.CHAIN_ID) >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { return RESOURCE_CLASS_CODES_V8.get(className); } @@ -183,6 +198,19 @@ private static ClassCode load(ClassReader classReader) { return classCode; } + private static Map loadBaseFromResource() { + try (InputStream baseInputStream = ClassCodeLoader.class.getResourceAsStream("/used_classes_base")) { + if (baseInputStream == null) { + return new HashMap<>(0); + } else { + Map usedClasses = loadJar(baseInputStream); + return usedClasses; + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + private static Map loadFromResource() { return loadFromResourceWithResourceName("/used_classes_sdk"); } @@ -191,24 +219,22 @@ private static Map loadFromResource_v8() { return loadFromResourceWithResourceName("/used_classes_sdk_v8"); } + private static Map loadFromResource_v14() { + return loadFromResourceWithResourceName("/used_classes_sdk_v14"); + } + private static Map loadFromResourceWithResourceName(String usedClassesName) { - try (InputStream baseInputStream = ClassCodeLoader.class.getResourceAsStream("/used_classes_base"); - InputStream sdkInputStream = ClassCodeLoader.class.getResourceAsStream(usedClassesName); - ) { - if (baseInputStream == null) { - return new HashMap<>(0); + try (InputStream sdkInputStream = ClassCodeLoader.class.getResourceAsStream(usedClassesName)) { + if (sdkInputStream == null) { + return BASE_USED_CLASSES; } else { - Map usedClasses = loadJar(baseInputStream); - if (sdkInputStream == null) { - return usedClasses; - } else { - Map sdkClasses = loadJar(sdkInputStream); - if (sdkClasses != null && usedClasses != null) { - usedClasses.putAll(sdkClasses); - } - return usedClasses; + Map sdkClasses = loadJar(sdkInputStream); + if (sdkClasses != null) { + sdkClasses.putAll(BASE_USED_CLASSES); } + return sdkClasses; } + } catch (Exception e) { throw new RuntimeException(e); } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java index 46ed3b8259..ab2510bea3 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java @@ -25,9 +25,6 @@ package io.nuls.contract.vm.natives.io.nuls.contract.sdk; import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.contract.config.ContractContext; -import io.nuls.contract.sdk.Address; import io.nuls.contract.vm.*; import io.nuls.contract.vm.code.MethodCode; import io.nuls.contract.vm.exception.ErrorException; @@ -147,7 +144,7 @@ private static BigInteger totalBalance(byte[] address, Frame frame) { /** * native * - * @see Address#balance() + * see Address#balance() */ private static Result balance(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { ObjectRef objectRef = methodArgs.objectRef; @@ -175,7 +172,7 @@ private static Result balanceOfDesignatedAsset(MethodCode methodCode, MethodArgs /** * native * - * @see Address#totalBalance() + * see Address#totalBalance() */ private static Result totalBalance(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { ObjectRef objectRef = methodArgs.objectRef; @@ -204,7 +201,7 @@ private static Result totalBalanceOfDesignatedAsset(MethodCode methodCode, Metho /** * native * - * @see Address#transfer(BigInteger) + * see Address#transfer(BigInteger) */ private static Result transfer(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { return transferBase(methodCode, methodArgs, frame, CHAIN_ID, ASSET_ID, 0); @@ -274,7 +271,7 @@ private static Result transferBase(MethodCode methodCode, MethodArgs methodArgs, /** * native * - * @see Address#call(String, String, String[][], BigInteger) + * see Address#call(String, String, String[][], BigInteger) */ private static Result call(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { return call(methodCode, methodArgs, frame, false, null); @@ -459,7 +456,7 @@ private static void checkBalance(byte[] address, int assetChainId, int assetId, /** * native * - * @see Address#valid(String) + * see Address#valid(String) */ private static Result valid(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { ObjectRef objectRef = (ObjectRef) methodArgs.invokeArgs[0]; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java index 14599d2554..3c61a80acd 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java @@ -25,7 +25,6 @@ package io.nuls.contract.vm.natives.io.nuls.contract.sdk; import io.nuls.contract.model.dto.BlockHeaderDto; -import io.nuls.contract.sdk.Block; import io.nuls.contract.vm.Frame; import io.nuls.contract.vm.MethodArgs; import io.nuls.contract.vm.ObjectRef; @@ -77,7 +76,7 @@ public static Result nativeRun(MethodCode methodCode, MethodArgs methodArgs, Fra /** * native * - * @see Block#getBlockHeader(long) + * see Block#getBlockHeader(long) */ private static Result getBlockHeader(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { long blockNumber = (long) methodArgs.invokeArgs[0]; @@ -91,7 +90,7 @@ private static Result getBlockHeader(MethodCode methodCode, MethodArgs methodArg /** * native * - * @see Block#currentBlockHeader() + * see Block#currentBlockHeader() */ private static Result currentBlockHeader(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { long blockNumber = frame.vm.getProgramInvoke().getNumber(); @@ -105,7 +104,7 @@ private static Result currentBlockHeader(MethodCode methodCode, MethodArgs metho /** * native * - * @see Block#newestBlockHeader() + * see Block#newestBlockHeader() */ private static Result newestBlockHeader(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { long blockNumber = frame.vm.getProgramInvoke().getNumber(); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java index d911edfc7a..a813615728 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java @@ -24,16 +24,12 @@ */ package io.nuls.contract.vm.natives.io.nuls.contract.sdk; -import io.nuls.contract.sdk.Msg; import io.nuls.contract.vm.Frame; import io.nuls.contract.vm.MethodArgs; -import io.nuls.contract.vm.ObjectRef; import io.nuls.contract.vm.Result; import io.nuls.contract.vm.code.MethodCode; import io.nuls.contract.vm.natives.NativeMethod; -import static io.nuls.contract.config.ContractContext.ASSET_ID; -import static io.nuls.contract.config.ContractContext.CHAIN_ID; import static io.nuls.contract.vm.natives.NativeMethod.NOT_SUPPORT_NATIVE; import static io.nuls.contract.vm.natives.NativeMethod.SUPPORT_NATIVE; @@ -100,7 +96,7 @@ public static Result nativeRun(MethodCode methodCode, MethodArgs methodArgs, Fra /** * native * - * @see Msg#gasleft() + * see Msg#gasleft() */ private static Result gasleft(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { Result result = NativeMethod.result(methodCode, frame.vm.getGasLeft(), frame); @@ -112,7 +108,7 @@ private static Result gasleft(MethodCode methodCode, MethodArgs methodArgs, Fram /** * native * - * @see Msg#sender() + * see Msg#sender() */ private static Result sender(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { Result result = NativeMethod.result(methodCode, frame.vm.getProgramContext().getSender(), frame); @@ -124,7 +120,7 @@ private static Result sender(MethodCode methodCode, MethodArgs methodArgs, Frame /** * native * - * @see Msg#senderPublicKey() + * see Msg#senderPublicKey() */ private static Result senderPublicKey(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { Result result = NativeMethod.result(methodCode, frame.vm.getProgramContext().getSenderPublicKey(), frame); @@ -136,7 +132,7 @@ private static Result senderPublicKey(MethodCode methodCode, MethodArgs methodAr /** * native * - * @see Msg#value() + * see Msg#value() */ private static Result value(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { Result result = NativeMethod.result(methodCode, frame.vm.getProgramContext().getValue(), frame); @@ -155,7 +151,7 @@ private static Result multyAssetValues(MethodCode methodCode, MethodArgs methodA /** * native * - * @see Msg#gasprice() + * see Msg#gasprice() */ private static Result gasprice(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { Result result = NativeMethod.result(methodCode, frame.vm.getProgramContext().getGasPrice(), frame); @@ -167,7 +163,7 @@ private static Result gasprice(MethodCode methodCode, MethodArgs methodArgs, Fra /** * native * - * @see Msg#address() + * see Msg#address() */ private static Result address(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { Result result = NativeMethod.result(methodCode, frame.vm.getProgramContext().getAddress(), frame); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java index f5c0b72fa3..08d1314a7e 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java @@ -25,6 +25,7 @@ package io.nuls.contract.vm.natives.io.nuls.contract.sdk; import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.Address; import io.nuls.base.data.CoinData; import io.nuls.base.data.CoinFrom; import io.nuls.base.data.Transaction; @@ -41,7 +42,7 @@ import io.nuls.contract.model.bo.ContractTokenAssetsInfo; import io.nuls.contract.model.dto.BlockHeaderDto; import io.nuls.contract.rpc.call.ChainManagerCall; -import io.nuls.contract.sdk.Event; +import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.vm.*; import io.nuls.contract.vm.code.ClassCode; @@ -50,26 +51,24 @@ import io.nuls.contract.vm.code.VariableType; import io.nuls.contract.vm.exception.ErrorException; import io.nuls.contract.vm.natives.NativeMethod; -import io.nuls.contract.vm.program.ProgramAccount; -import io.nuls.contract.vm.program.ProgramInvokeRegisterCmd; -import io.nuls.contract.vm.program.ProgramNewTx; -import io.nuls.contract.vm.program.ProgramResult; +import io.nuls.contract.vm.program.*; import io.nuls.contract.vm.program.impl.ProgramInvoke; import io.nuls.contract.vm.util.Constants; import io.nuls.contract.vm.util.JsonUtils; import io.nuls.contract.vm.util.Utils; +import io.nuls.core.constant.BaseConstant; import io.nuls.core.core.ioc.SpringLiteContext; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.crypto.KeccakHash; import io.nuls.core.crypto.Sha3Hash; import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rpc.model.message.Response; import org.apache.commons.lang3.StringUtils; import java.io.IOException; import java.math.BigInteger; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import static io.nuls.contract.config.ContractContext.ASSET_ID; import static io.nuls.contract.config.ContractContext.CHAIN_ID; @@ -166,7 +165,7 @@ public static Result nativeRun(MethodCode methodCode, MethodArgs methodArgs, Fra /** * native * - * @see Utils#revert(String) + * see Utils#revert(String) */ private static Result revert(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { ObjectRef objectRef = (ObjectRef) methodArgs.invokeArgs[0]; @@ -182,7 +181,7 @@ private static Result revert(MethodCode methodCode, MethodArgs methodArgs, Frame /** * native * - * @see Utils#emit(Event) + * see Utils#emit(Event) */ private static Result emit(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { ObjectRef objectRef = (ObjectRef) methodArgs.invokeArgs[0]; @@ -384,7 +383,7 @@ public void setPayload(Map payload) { /** * native * - * @see Utils#sha3(String) + * see Utils#sha3(String) */ private static Result sha3(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { frame.vm.addGasUsed(GasCost.SHA3); @@ -404,7 +403,7 @@ private static Result sha3(MethodCode methodCode, MethodArgs methodArgs, Frame f /** * native * - * @see Utils#sha3(byte[]) + * see Utils#sha3(byte[]) */ private static Result sha3Bytes(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { frame.vm.addGasUsed(GasCost.SHA3); @@ -554,6 +553,29 @@ private static Result invokeExternalCmd(MethodCode methodCode, MethodArgs method ObjectRef objectRef = frame.heap.newString(crossTokenSystemContract); Result result = NativeMethod.result(methodCode, objectRef, frame); return result; + } else if ("createContract".equals(cmdName)) { + // add by pierre at 2022/6/1 p14 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_14 ) { + return createContract(methodCode, methodArgs, frame); + } + } else if ("encodePacked".equals(cmdName)) { + // add by pierre at 2022/6/1 p14 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_14 ) { + String[] args = (String[]) frame.heap.getObject(argsRef); + return encodePacked(args, methodCode, frame); + } + } else if ("computeAddress".equals(cmdName)) { + // add by pierre at 2022/6/1 p14 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_14 ) { + String[] args = (String[]) frame.heap.getObject(argsRef); + return computeAddress(args, methodCode, frame); + } + } else if ("getCodeHash".equals(cmdName)) { + // add by pierre at 2022/6/16 p14 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_14 ) { + String[] args = (String[]) frame.heap.getObject(argsRef); + return getCodeHash(args, methodCode, frame); + } } String[] args = (String[]) frame.heap.getObject(argsRef); @@ -630,6 +652,157 @@ private static Result invokeExternalCmd(MethodCode methodCode, MethodArgs method return result; } + private static Result getCodeHash(String[] args, MethodCode methodCode, Frame frame) { + try { + String codeAddress = args[0]; + + // 查找contractCode + byte[] codeAddressBytes = AddressTool.getAddress(codeAddress); + // 验证codeAddress是合约地址 + if (!NativeAddress.isContract(codeAddressBytes, frame)) { + throw new Exception("Not contract address"); + } + byte[] codeHash = frame.vm.getRepository().getCodeHash(codeAddressBytes); + Object resultValue = frame.heap.newString(HexUtil.encode(codeHash)); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } catch (Exception e) { + throw new ErrorException("Invoke external cmd failed. When getCodeHash.", frame.vm.getGasUsed(), e.getMessage()); + } + } + + private static Result computeAddress(String[] args, MethodCode methodCode, Frame frame) { + try { + int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); + String salt = args[0]; + String codeHash = args[1]; + String sender = args[2]; + + // 根据规则生成合约地址 + ProgramCreateData createData = new ProgramCreateData( + AddressTool.getAddress(sender), + Utils.dataToBytes(salt), + HexUtil.decode(codeHash)); + Address newAddress = new Address(currentChainId, BaseConstant.CONTRACT_ADDRESS_TYPE, SerializeUtils.sha256hash160(KeccakHash.keccakBytes(createData.serialize(), 256))); + + Object resultValue = frame.heap.newString(newAddress.toString()); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } catch (IOException e) { + throw new ErrorException("Invoke external cmd failed. When computeAddress.", frame.vm.getGasUsed(), e.getMessage()); + } + } + + private static Result encodePacked(String[] args, MethodCode methodCode, Frame frame) { + try { + ProgramEncodePacked encodePacked; + if (args == null) { + encodePacked = new ProgramEncodePacked((short) 0, args); + } else { + encodePacked = new ProgramEncodePacked((short) args.length, args); + } + Object resultValue = frame.heap.newString(HexUtil.encode(encodePacked.serialize())); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } catch (IOException e) { + throw new ErrorException("Invoke external cmd failed. When encodePacked.", frame.vm.getGasUsed(), e.getMessage()); + } + } + + private static Result createContract(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { + ProgramInvoke programInvoke = frame.vm.getProgramInvoke(); + if (programInvoke.isCreate()) { + throw new ErrorException("Invoke external cmd failed. This method cannot be called when creating a contract.", frame.vm.getGasUsed(), null); + } + int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); + + ObjectRef argsRef = (ObjectRef) methodArgs.invokeArgs[1]; + String[] _args = (String[]) frame.heap.getObject(argsRef); + int length = _args.length; + // 验证codeAddress是合约地址 + String codeAddress = _args[0]; + byte[] codeAddressBytes = AddressTool.getAddress(codeAddress); + if (!NativeAddress.isContract(codeAddressBytes, frame)) { + throw new ErrorException("Invoke external cmd failed. When creating a contract. [codeCopy] is not a contract address.", frame.vm.getGasUsed(), null); + } + String salt = _args[1]; + String[][] args; + if (length == 2) { + args = null; + } else { + String[] subArgs = new String[length - 2]; + System.arraycopy(_args, 2, subArgs, 0, length - 2); + args = ContractUtil.twoDimensionalArray(subArgs); + } + ProgramResult programResult; + try { + programResult = createContract(currentChainId, salt, codeAddressBytes, args, frame); + } catch (IOException e) { + throw new ErrorException("Invoke external cmd failed. When creating a contract.", frame.vm.getGasUsed(), e.getMessage()); + } + + if (!programResult.isSuccess()) { + return new Result(); + } + List internalCreates = frame.vm.getInternalCreates(); + ProgramInternalCreate create = frame.vm.getInternalCreates().get(internalCreates.size() - 1); + Object resultValue = frame.heap.newString(AddressTool.getStringAddressByBytes(create.getContractAddress())); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } + + private static ProgramResult createContract(int chainId, String salt, byte[] codeAddressBytes, String[][] args, Frame frame) throws IOException { + ProgramInvoke programInvoke = frame.vm.getProgramInvoke(); + // 查找contractCode + byte[] codes = frame.vm.getRepository().getCode(codeAddressBytes); + byte[] codeHash = frame.vm.getRepository().getCodeHash(codeAddressBytes); + + // 根据规则生成合约地址 + ProgramCreateData createData = new ProgramCreateData( + programInvoke.getContractAddress(), + Utils.dataToBytes(salt), + codeHash); + Address newAddress = new Address(chainId, BaseConstant.CONTRACT_ADDRESS_TYPE, SerializeUtils.sha256hash160(KeccakHash.keccakBytes(createData.serialize(), 256))); + + ProgramCreate programCreate = new ProgramCreate(); + programCreate.setContractAddress(newAddress.getAddressBytes()); + programCreate.setSender(programInvoke.getContractAddress()); + programCreate.setValue(BigInteger.ZERO); + programCreate.setPrice(programInvoke.getPrice()); + programCreate.setGasLimit(frame.vm.getGasLeft()); + programCreate.setNumber(programInvoke.getNumber()); + programCreate.setContractCode(codes); + programCreate.setArgs(args); + programCreate.setSenderPublicKey(programInvoke.getSenderPublicKey()); + programCreate.setInternalCreate(true); + programCreate.setEstimateGas(programInvoke.isEstimateGas()); + + ProgramInternalCreate programInternalCreate = new ProgramInternalCreate(); + programInternalCreate.setSender(programCreate.getSender()); + programInternalCreate.setContractAddress(programCreate.getContractAddress()); + programInternalCreate.setContractCode(programCreate.getContractCode()); + programInternalCreate.setCodeCopyBy(codeAddressBytes); + programInternalCreate.setArgs(programCreate.getArgs()); + + frame.vm.getInternalCreates().add(programInternalCreate); + + ProgramResult programResult = frame.vm.getProgramExecutor().callProgramExecutor().create(programCreate); + + frame.vm.addGasUsed(programResult.getGasUsed()); + frame.vm.getDebugEvents().addAll(programResult.getDebugEvents()); + if (programResult.isSuccess()) { + frame.vm.getEvents().addAll(programResult.getEvents()); + return programResult; + } else { + Iterator descendingIterator = programResult.getStackTraces().descendingIterator(); + while (descendingIterator.hasNext()) { + frame.vm.getStackTraces().addFirst(descendingIterator.next()); + } + frame.throwRuntimeException(programResult.getErrorMessage()); + return programResult; + } + } + private static ObjectRef tokenOutCrossChainCmdProcessor(int currentChainId, byte[] senderBytes, String contractSender, String[] args, String contractAddress, byte[] contractAddressBytes, CmdRegisterManager cmdRegisterManager, String moduleCode, String cmdName, Map argsMap, ProgramInvokeRegisterCmd invokeRegisterCmd, Frame frame) { @@ -862,7 +1035,7 @@ private static ObjectRef listToObjectRef(List resultList, Frame frame) { /** * native *s - * @see io.nuls.contract.sdk.Utils#obj2Json(Object) + * see io.nuls.contract.sdk.Utils#obj2Json(Object) */ private static Result obj2Json(MethodCode methodCode, MethodArgs methodArgs, Frame frame) { frame.vm.addGasUsed(GasCost.OBJ_TO_JSON); @@ -870,6 +1043,11 @@ private static Result obj2Json(MethodCode methodCode, MethodArgs methodArgs, Fra ObjectRef ref = null; if (objectRef != null) { String json = objectRef2Json(objectRef, frame.heap, frame.methodArea); + // add by pierre at 2022/6/16 p14 + int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_14 ) { + frame.vm.addGasUsed(GasCost.OBJ_TO_JSON_PER_CHAR * json.length()); + } ref = frame.heap.newString(json); } Result result = NativeMethod.result(methodCode, ref, frame); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java index 9fef01d5cd..a1180c6f1e 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java @@ -80,6 +80,16 @@ public class ProgramCreate { * 是否估计Gas */ private boolean estimateGas; + // add by pierre at 2022/6/1 p14 + private boolean internalCreate; + + public boolean isInternalCreate() { + return internalCreate; + } + + public void setInternalCreate(boolean internalCreate) { + this.internalCreate = internalCreate; + } public void args(String... args) { setArgs(args); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java new file mode 100644 index 0000000000..7acc4533fd --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java @@ -0,0 +1,171 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.vm.program; + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @Author: PierreLuo + */ +public class ProgramCreateData extends BaseNulsData { + + private final byte hard = (byte) 255; + private byte[] sender; + private byte[] salt; + private byte[] codeHash; + //private short argsCount; + //private String[][] args; + + + public ProgramCreateData(byte[] sender, byte[] salt, byte[] codeHash) { + this.sender = sender; + this.salt = salt; + this.codeHash = codeHash; + } + + //public ProgramCreateData(byte[] sender, byte[] salt, byte[] code, short argsCount, String[][] args) { + // this.sender = sender; + // this.salt = salt; + // this.code = code; + // this.argsCount = argsCount; + // this.args = args; + //} + + @Override + public int size() { + int size = 1; + size += Address.ADDRESS_LENGTH; + size += SerializeUtils.sizeOfBytes(salt); + size += SerializeUtils.sizeOfBytes(codeHash); + //size += 1; + //if (args != null) { + // for (String[] arg : args) { + // if (arg == null) { + // size += 1; + // } else { + // size += 1; + // for (String str : arg) { + // size += SerializeUtils.sizeOfString(str); + // } + // } + // } + //} + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(hard); + stream.write(sender); + stream.writeBytesWithLength(salt); + stream.writeBytesWithLength(codeHash); + //stream.writeUint8(argsCount); + //if (args != null) { + // for (String[] arg : args) { + // if (arg == null) { + // stream.writeUint8((short) 0); + // } else { + // stream.writeUint8((short) arg.length); + // for (String str : arg) { + // stream.writeString(str); + // } + // } + // } + //} + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + byteBuffer.readByte(); + this.sender = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + this.salt = byteBuffer.readByLengthByte(); + this.codeHash = byteBuffer.readByLengthByte(); + //this.argsCount = byteBuffer.readUint8(); + //short length = this.argsCount; + //this.args = new String[length][]; + //for (short i = 0; i < length; i++) { + // short argCount = byteBuffer.readUint8(); + // if (argCount == 0) { + // args[i] = new String[0]; + // } else { + // String[] arg = new String[argCount]; + // for (short k = 0; k < argCount; k++) { + // arg[k] = byteBuffer.readString(); + // } + // args[i] = arg; + // } + //} + } + + public byte getHard() { + return hard; + } + + public byte[] getSender() { + return sender; + } + + public void setSender(byte[] sender) { + this.sender = sender; + } + + public byte[] getSalt() { + return salt; + } + + public void setSalt(byte[] salt) { + this.salt = salt; + } + + public byte[] getCodeHash() { + return codeHash; + } + + public void setCodeHash(byte[] codeHash) { + this.codeHash = codeHash; + } + + //public short getArgsCount() { + // return argsCount; + //} + // + //public void setArgsCount(short argsCount) { + // this.argsCount = argsCount; + //} + // + //public String[][] getArgs() { + // return args; + //} + // + //public void setArgs(String[][] args) { + // this.args = args; + //} +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java new file mode 100644 index 0000000000..281c68d2d3 --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java @@ -0,0 +1,93 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.vm.program; + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @Author: PierreLuo + */ +public class ProgramEncodePacked extends BaseNulsData { + + private short argsCount; + private String[] args; + + public ProgramEncodePacked(short argsCount, String[] args) { + this.argsCount = argsCount; + this.args = args; + } + + @Override + public int size() { + int size = 1; + if (args != null) { + for (String str : args) { + size += SerializeUtils.sizeOfString(str); + } + } + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.writeUint8(argsCount); + if (args != null) { + for (String str : args) { + stream.writeString(str); + } + } + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.argsCount = byteBuffer.readUint8(); + short length = this.argsCount; + this.args = new String[length]; + for (short k = 0; k < length; k++) { + args[k] = byteBuffer.readString(); + } + } + + public short getArgsCount() { + return argsCount; + } + + public void setArgsCount(short argsCount) { + this.argsCount = argsCount; + } + + public String[] getArgs() { + return args; + } + + public void setArgs(String[] args) { + this.args = args; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java index f9d680d102..714c7974d9 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java @@ -44,6 +44,11 @@ public interface ProgramExecutor { List method(byte[] address); + byte[] contractCode(byte[] address); + + // add by pierre at 2022/6/17 p14 + byte[] contractCodeHash(byte[] address); + List jarMethod(byte[] jarData); ProgramStatus status(byte[] address); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java new file mode 100644 index 0000000000..a5e3838b1c --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java @@ -0,0 +1,94 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.contract.vm.program; + +// add by pierre at 2022/6/1 p14 +public class ProgramInternalCreate { + + /** + * 创建者 + */ + private byte[] sender; + + /** + * 合约地址 + */ + private byte[] contractAddress; + + /** + * 合约代码 + */ + private byte[] contractCode; + + /** + * 内部创建合约，所依据的合约 + */ + private byte[] codeCopyBy; + + /** + * 参数列表 + */ + private String[][] args; + + public byte[] getCodeCopyBy() { + return codeCopyBy; + } + + public void setCodeCopyBy(byte[] codeCopyBy) { + this.codeCopyBy = codeCopyBy; + } + + public byte[] getSender() { + return sender; + } + + public void setSender(byte[] sender) { + this.sender = sender; + } + + public byte[] getContractAddress() { + return contractAddress; + } + + public void setContractAddress(byte[] contractAddress) { + this.contractAddress = contractAddress; + } + + public byte[] getContractCode() { + return contractCode; + } + + public void setContractCode(byte[] contractCode) { + this.contractCode = contractCode; + } + + public String[][] getArgs() { + return args; + } + + public void setArgs(String[][] args) { + this.args = args; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramResult.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramResult.java index 1fd667a015..4221b12e73 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramResult.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramResult.java @@ -62,6 +62,16 @@ public class ProgramResult { // add by pierre at 2020-11-03 可能影响兼容性，考虑协议升级 private LinkedList stackTraces = new LinkedList<>(); + // add by pierre at 2022/6/1 p14 + private List internalCreates = new ArrayList<>(); + + public List getInternalCreates() { + return internalCreates; + } + + public void setInternalCreates(List internalCreates) { + this.internalCreates = internalCreates; + } public LinkedList getStackTraces() { return stackTraces; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java index f66deb0a81..19984d617c 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java @@ -24,12 +24,6 @@ */ package io.nuls.contract.vm.program.impl; -import io.nuls.contract.sdk.*; -import io.nuls.contract.sdk.annotation.Payable; -import io.nuls.contract.sdk.annotation.PayableMultyAsset; -import io.nuls.contract.sdk.annotation.Required; -import io.nuls.contract.sdk.annotation.View; -import io.nuls.contract.sdk.event.DebugEvent; import java.math.BigDecimal; import java.math.BigInteger; @@ -37,40 +31,64 @@ public class ProgramConstants { - public static final String CONTRACT_INTERFACE_NAME = classNameReplace(Contract.class.getName()); - - public static final String EVENT_INTERFACE_NAME = classNameReplace(Event.class.getName()); - - public static final Class[] SDK_CLASSES = new Class[]{ - Address.class, - Block.class, - BlockHeader.class, - Contract.class, - Event.class, - Msg.class, - Utils.class, - View.class, - Required.class, - Payable.class, - DebugEvent.class + public static final String CONTRACT_INTERFACE_NAME = "io/nuls/contract/sdk/Contract"; + + public static final String EVENT_INTERFACE_NAME = "io/nuls/contract/sdk/Event"; + + public static String[] SDK_CLASS_NAMES = new String[] { + "io/nuls/contract/sdk/Address", + "io/nuls/contract/sdk/Block", + "io/nuls/contract/sdk/BlockHeader", + "io/nuls/contract/sdk/Contract", + "io/nuls/contract/sdk/Event", + "io/nuls/contract/sdk/Msg", + "io/nuls/contract/sdk/Utils", + "io/nuls/contract/sdk/annotation/View", + "io/nuls/contract/sdk/annotation/Required", + "io/nuls/contract/sdk/annotation/Payable", + "io/nuls/contract/sdk/event/DebugEvent" }; - public static final Class[] SDK_CLASSES_V8 = new Class[]{ - Address.class, - Block.class, - BlockHeader.class, - Contract.class, - Event.class, - Msg.class, - Utils.class, - View.class, - Required.class, - Payable.class, - DebugEvent.class, - PayableMultyAsset.class, - MultyAssetValue.class + public static String[] SDK_CLASS_NAMES_V8_ADD = new String[] { + "io/nuls/contract/sdk/annotation/PayableMultyAsset", + "io/nuls/contract/sdk/MultyAssetValue" }; + public static String[] SDK_CLASS_NAMES_V14_ADD = new String[] { + "io/nuls/contract/sdk/token/AssetWrapper", + "io/nuls/contract/sdk/token/NRC20Wrapper", + "io/nuls/contract/sdk/token/Token" + }; + //public static final Class[] SDK_CLASSES = new Class[]{ + // Address.class, + // Block.class, + // BlockHeader.class, + // Contract.class, + // Event.class, + // Msg.class, + // Utils.class, + // View.class, + // Required.class, + // Payable.class, + // DebugEvent.class + //}; + + //public static final Class[] SDK_CLASSES_V8 = new Class[]{ + // Address.class, + // Block.class, + // BlockHeader.class, + // Contract.class, + // Event.class, + // Msg.class, + // Utils.class, + // View.class, + // Required.class, + // Payable.class, + // DebugEvent.class, + // PayableMultyAsset.class, + // MultyAssetValue.class + //}; + public static final Class[] CONTRACT_USED_CLASSES = new Class[]{ Boolean.class, Byte.class, @@ -109,7 +127,7 @@ public class ProgramConstants { StackOverflowError.class, }; - public static String[] SDK_CLASS_NAMES = new String[SDK_CLASSES.length]; + //public static String[] SDK_CLASS_NAMES = new String[SDK_CLASSES.length]; public static final String[] CONTRACT_USED_CLASS_NAMES = new String[CONTRACT_USED_CLASSES.length]; @@ -118,9 +136,10 @@ public class ProgramConstants { public static final String[] VM_INIT_CLASS_NAMES = new String[VM_INIT_CLASSES.length]; static { - for (int i = 0; i < SDK_CLASSES.length; i++) { - SDK_CLASS_NAMES[i] = classNameReplace(SDK_CLASSES[i].getName()); - } + //for (int i = 0; i < SDK_CLASSES.length; i++) { + // SDK_CLASS_NAMES[i] = classNameReplace(SDK_CLASSES[i].getName()); + //} + for (int i = 0; i < CONTRACT_USED_CLASSES.length; i++) { CONTRACT_USED_CLASS_NAMES[i] = classNameReplace(CONTRACT_USED_CLASSES[i].getName()); } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java index d24324c632..1de28fadad 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java @@ -267,6 +267,47 @@ public ProgramResult call(ProgramCall programCall) { private Map> contractArrays; private Map contractObjectRefCount; + private ProgramResult checkExecute(ProgramInvoke programInvoke, MethodCode methodCode) { + String methodName = programInvoke.getMethodName(); + String methodDescBase = programInvoke.getMethodDesc(); + BigInteger transferValue = programInvoke.getValue(); + String contractAddress = programInvoke.getAddress(); + byte[] sender = programInvoke.getSender(); + if (methodCode == null) { + return revert(String.format("can't find method %s%s", methodName, methodDescBase == null ? "" : methodDescBase)); + } + if (!methodCode.isPublic) { + return revert("can only invoke public method"); + } + if (transferValue.compareTo(BigInteger.ZERO) > 0) { + if (!methodCode.hasPayableAnnotation()) + return revert(String.format("contract[%s]'s method[%s] is not a payable method", contractAddress, methodCode.name)); + } + List multyAssetValues = programInvoke.getMultyAssetValues(); + if (multyAssetValues != null && !multyAssetValues.isEmpty()) { + if (!methodCode.hasPayableMultyAssetAnnotation()) + return revert(String.format("contract[%s]'s method[%s] is not a payableMultyAsset method", contractAddress, methodCode.name)); + } + // 不允许非系统调用此方法 + boolean isBalanceTriggerForConsensusContractMethod = BALANCE_TRIGGER_METHOD_NAME.equals(methodName) && + BALANCE_TRIGGER_FOR_CONSENSUS_CONTRACT_METHOD_DESC.equals(methodDescBase); + if (isBalanceTriggerForConsensusContractMethod) { + if (sender != null) { + return revert("can't invoke _payable(String[][] args) method"); + } + } + if (methodCode.argsVariableType.size() != programInvoke.getArgs().length) { + do { + if (isBalanceTriggerForConsensusContractMethod && programInvoke.getArgs().length > 0) { + break; + } + return revert(String.format("require %s parameters in method [%s%s]", + methodCode.argsVariableType.size(), methodCode.name, methodCode.normalDesc)); + } while (false); + } + return null; + } + private ProgramResult execute(ProgramInvoke programInvoke) { if (programInvoke.getPrice() < 1) { return revert("gas price must be greater than zero"); @@ -299,6 +340,7 @@ private ProgramResult execute(ProgramInvoke programInvoke) { String methodDescBase = programInvoke.getMethodDesc(); byte[] contractCodeData = programInvoke.getData(); BigInteger transferValue = programInvoke.getValue(); + List multyAssetValues = programInvoke.getMultyAssetValues(); Map classCodes; if (programInvoke.isCreate()) { if (contractCodeData == null) { @@ -336,6 +378,10 @@ private ProgramResult execute(ProgramInvoke programInvoke) { vm = VMFactory.createVM(); logTime("load vm"); + // add by pierre at 2022/6/16 p14 + if (ProtocolGroupManager.getCurrentVersion(getCurrentChainId()) >= ContractContext.PROTOCOL_14) { + vm.addGasUsed(contractCodeData == null ? 0 : contractCodeData.length * GasCost.CREATE_PER_BYTE); + } vm.setProgramExecutor(this); vm.heap.loadClassCodes(classCodes); // add by pierre at 2019-11-21 标记 当存在合约内部调用合约，共享同一个合约的内存数据 需要协议升级 done @@ -398,7 +444,15 @@ private ProgramResult execute(ProgramInvoke programInvoke) { String methodDesc = ProgramDescriptors.parseDesc(methodDescBase); MethodCode methodCode = vm.methodArea.loadMethod(contractClassCode.name, methodName, methodDesc); - if (methodCode == null) { + ProgramResult checkExecute = this.checkExecute(programInvoke, methodCode); + if (checkExecute != null) { + // add by pierre at 2022/6/17 p14 + if (ProtocolGroupManager.getCurrentVersion(getCurrentChainId()) >= ContractContext.PROTOCOL_14 && programInvoke.isCreate()) { + checkExecute.setGasUsed(vm.getGasUsed()); + } + return checkExecute; + } + /*if (methodCode == null) { return revert(String.format("can't find method %s%s", methodName, methodDescBase == null ? "" : methodDescBase)); } if (!methodCode.isPublic) { @@ -429,7 +483,7 @@ private ProgramResult execute(ProgramInvoke programInvoke) { return revert(String.format("require %s parameters in method [%s%s]", methodCode.argsVariableType.size(), methodCode.name, methodCode.normalDesc)); } while (false); - } + }*/ logTime("load method"); ObjectRef objectRef; @@ -481,7 +535,10 @@ private ProgramResult execute(ProgramInvoke programInvoke) { } vm.setRepository(repository); vm.setGas(programInvoke.getGasLimit()); - vm.addGasUsed(contractCodeData == null ? 0 : contractCodeData.length); + // add by pierre at 2022/6/16 p14 + if (ProtocolGroupManager.getCurrentVersion(getCurrentChainId()) < ContractContext.PROTOCOL_14) { + vm.addGasUsed(contractCodeData == null ? 0 : contractCodeData.length); + } logTime("load end"); @@ -527,6 +584,8 @@ private ProgramResult execute(ProgramInvoke programInvoke) { programResult.setEvents(vm.getEvents()); programResult.setInvokeRegisterCmds(vm.getInvokeRegisterCmds()); programResult.setOrderedInnerTxs(vm.getOrderedInnerTxs()); + // add by pierre at 2022/6/2 p14 + programResult.setInternalCreates(vm.getInternalCreates()); if (resultValue != null) { if (resultValue instanceof ObjectRef) { @@ -690,6 +749,22 @@ public List method(byte[] address) { return jarMethod(codes); } + @Override + public byte[] contractCode(byte[] address) { + checkThread(); + this.revert = true; + byte[] codes = repository.getCode(address); + return codes; + } + + @Override + public byte[] contractCodeHash(byte[] address) { + checkThread(); + this.revert = true; + byte[] codes = repository.getCodeHash(address); + return codes; + } + @Override public List jarMethod(byte[] jarData) { this.revert = true; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java index 8c18ea45ef..ed051ba9ef 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java @@ -100,6 +100,15 @@ public class ProgramInvoke { private boolean create; private boolean internalCall; + private boolean internalCreate; + + public boolean isInternalCreate() { + return internalCreate; + } + + public void setInternalCreate(boolean internalCreate) { + this.internalCreate = internalCreate; + } public byte[] getContractAddress() { return contractAddress; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Utils.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Utils.java index cda4a879cb..11abc669f6 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Utils.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Utils.java @@ -26,6 +26,9 @@ import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; +import io.nuls.core.model.StringUtils; + +import java.nio.charset.StandardCharsets; public class Utils { @@ -47,4 +50,35 @@ public static boolean verify(String data, String signature, String pub) { return ECKey.verify(dataBytes, signatureBytes, pubBytes); } + public static byte[] dataToBytes(String data) { + if (StringUtils.isBlank(data)) { + return null; + } + try { + boolean isHex = true; + String validData = cleanHexPrefix(data); + char[] chars = validData.toCharArray(); + for (char c : chars) { + int digit = Character.digit(c, 16); + if (digit == -1) { + isHex = false; + break; + } + } + if (isHex) { + return HexUtil.decode(validData); + } + return data.getBytes(StandardCharsets.UTF_8); + } catch (Exception e) { + return data.getBytes(StandardCharsets.UTF_8); + } + } + + private static String cleanHexPrefix(String input) { + return containsHexPrefix(input) ? input.substring(2) : input; + } + + private static boolean containsHexPrefix(String input) { + return !StringUtils.isBlank(input) && input.length() > 1 && input.charAt(0) == '0' && input.charAt(1) == 'x'; + } } diff --git a/module/nuls-smart-contract/src/main/resources/protocol-config.json b/module/nuls-smart-contract/src/main/resources/protocol-config.json index dbee5ea107..009dc4df4b 100644 --- a/module/nuls-smart-contract/src/main/resources/protocol-config.json +++ b/module/nuls-smart-contract/src/main/resources/protocol-config.json @@ -1,4 +1,46 @@ [ + { + "version": "14", + "extend": "13", + "validTxs": [ + { + "type": "15", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CreateContractProcessorV14" + }, + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessorV14" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "13", + "extend": "8", + "validTxs": [ + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessorV13" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, { "version": "8", "extend": "4", diff --git a/module/nuls-smart-contract/src/main/resources/used_classes_sdk_v14 b/module/nuls-smart-contract/src/main/resources/used_classes_sdk_v14 new file mode 100644 index 0000000000000000000000000000000000000000..7e07e9eb95fe662d4402c9c17b2e20b45932b59c GIT binary patch literal 14610 zcmbWe19Y9+);}EEwr#7ijmAb}+i23bv8{%U)!24p+ia}1$v-(g_bc9e+H=3T#~$O^ zV?1llwSQ}^xhCbMfI*-D03ZMWOkzGN0sKG^03ZObEcG26j2!461_1!%|M5-er&0fT z)69ncpI=1y`9*6dONZaQjrm{Rer03rXs`du@i)V8e>cp*(BiM5C;$);5CG!8{AId7 z4HdMsd1WDPq;F_sPxse94p5P@!B$3j=#9i&oC`T7k&(i4k~G6vEOLtzlXw|}vB1J1 zV zhf7*n1X>txM`ZJ>t7IjF530;7WhLY99F$_UwBokZk8}sTEYfF5h3dVCcmFW+o~^pa zeZ+E4gn5z1$|T+C1l=;F(QK)3HbljQx;E5J!k3-1w&R`s6;kBEn5ubi?M%AgxY{hV zvJjmL{lPSBi$Zh*@@4Wi6g>B)_nJYi&XNw(Wz6_m_CkU_ojMM9tfDmyss1w2U~!bW zJOJEcR0%FZgq?j$kb|EGufJ1LMXgYG_>HD}{KxFA?8Oo^Yitn*;{&wqGMB_I^(wW) zC4$b8&_(L|2vV>`0RjF{Q)+QIRX2z+Yvtq;TO@`R$c2Hn$B-`fRD2F0q8jW0)|`Ee5`3m2Rj9=b`# zdX~3Og#-*LJ5e6;s}`$uB-0K1X1(h}&2;+c;v9x$!;{Xv;4aoQ9_=p{PUg@@Pmf>6 zeLSP_m^uapem4YEcq)Fj@0R;8lVsZqX<|sMwy91{4RU?g<4*PCZSEbY)-|f68R!gK(2IbY4oN6p6_8uH_y;uaRULPHuOc=eGv1r^ zo0B{rAzP8D;nTZ&Y{(Gqv^y?lK9h&h;p#{MOpMDK#Kxcp?ba-nC0Y4nka))0a4{~( z0|CDekx4LNW=s0$UpKzOjnqMBx{R3(Q9Q~f;;QFg5Vj)Ck;AtnY@dwpBm|LDBD#AOF$WsKfTE9dIPifv-6Xog_g;2Ier z1jMLwb&6W~(1{5_dHqz&)Q=<9bC&!{2p_TA`Y^?M$}vARuL0qLii-7}`9a%!A^t*- zW9K<~5>rD6+VR$UjMHQEGk4of^RDIR&wP9jKzhV0!TP8fk?RbitYJO2Ae$q5-Tr}b zf$yk3u)bo92)Rkd(6H0$Qp95GJq6O4s*vcBVr=Eh-pGX#8cvz25b1Je9Na0xsOqOw z@;mE`f6JJZgruL(3S){f!B9d}o|Cl^=bv&Q^a>ngy7o=R0uPUJ}z^Vk;CMR!F`&q@a|-lB%RE|o@WcynxC2G@f_rMl}p=|Asgv# z-I0N&W0q^+CRo<7n4mD$KZ?U5*~)#<54!EpBheR=wLNT^ZK_s-ynlcfQ_=3g-Gx;e zCpp6jIdrmz3QM1PLN5(JpTT+j!aRe8B9;|iMqXW*;^n z3wFYG8ma+O?+Ni$l<1WGK#fCZXs@!fnfT|MeiX=NZ6IG|Prb?%<7~HlwynHhx(&jYSIKMd!qjT!%h(vs z2psOE6pUJk(Xt&VEtNEs6TtPw%*VIM?j5)SF;mgtiZJM<9=qbY5IJE8prA%XAjuxO z;#iRI2fc0K8a#DWI;{z1<{I5FDzg?QLQy*|g)O$R`|xjn<}qBUlxIT-Rx2 zGTx6`vXVj>?A~V&8{;$yOs1Tc5?f+O||?E|3mLB^E&-Fw~Ix3IMPq_ zkp)#pm_0FVxZG*)eOQBwt6MC5fVI2{U)(LnRiyCA4HdH%Jdt<+*w%z&&rTiVFyw8zI}(77Il8F=rGZVb&sFt&F^`1Q%n{YuD4zw= zlUe(I*Ms8BR4d*);2JljoR}@G88kfwy45eHnM`}Lq@SkcD(r?t#Q>P=7M)+lM!9e{ zR7Bh%p4N)$b&_EaWCQwxapzndo10SJRL8EtTIv? zgZ1hDX)fTeadSez9t|F!jWN{}SrN+FE4UacAX9~acLjkZR@-yjflGY>zmn7NCN%q! z&fdP~g$Ji#k;VpBX9_Z&7gw>ODXyzztEdd%gt7E|Q;1(I_kel!rUmiAoChu2b#bro zQwdMmHP{Eymo@S4=OveoEI8i)z9M-ccxGp8;pu1Tt*LTEc7Lw636ZVQlpb7SmIVyL0gS3_cGF5Ax@oupk2I0o}ZbBi*jFTX}8lN9EZ zT4NKl`lj`KC72xOzyxoLkBQyEzt0!KX}0zfU>y zBD!0p&c=++j!Nr(*Qe7VHr;?R)%6R)W>eS=^gQYN_q{7QC{EQ8xes03d@h!G*k=S}~)oUlkw zs#yKpTLolUcY=;6TLAi%L2GsNM%sNenDU(t@YC$DrtofPe-MwoL^I=7v(&r$hg%Ta zx76^7cq#tP8a_m5oUf9FrKDcRW5WEdb5d7n4eu>fXZMm$&&y40 z+N%0?9o{AG_ay|m>wAue8={3>N*AV0a5e8YtU+hm2 zz~^#*F#^nZg-F`RL=~Zo!#QJnq}CU*NjZvxJ@01DD|drK=l$gWfkQZ=A2o0S0sxEy z{cchIrDY-TI=S>jd403td0O(urR;>Kxb5-of*yeV zOa^VYB8T{`GUpOr*RHy!FDve0eQb}mCuLCimi$CTw!UK5EDYF<7osJe{SYNPrdqOq zqUJeWwKb=TZ6aYheIm36Op#0-B?cLF0{cf=!{%%1 zvTrktznC01S}=#PigcMfr0xxP`r7lN*8|oSFU$6M_u5wCuk3VWH|W<6$`WWu@|Qap zuyvmRc1iN`R==#?hg{XghLmWM!(C_8;(d`ZRd3ZKmxm{G%xZ3v{C3C1e==@9Od)O) zzkmDSu*N_?z$;LAZQ>@~wn>U|EDR}qPfB4i5|nfMS`*S*s;8tBgH?(x!zz~a^C|6^ z6*KpPt`qjxydvO$*?#v74Z^r1$O1SL)PvD(o!$)xw_fBKwq2_OpHE% zUkT|bQkNw?9j=KhAXrVXlTF{iDqkxU7H$^#4r1WhidR{|+JQan+@vrK9piJQ_#vY0 z3_hZ^G7$$^A0b;&K5uNc$CyxVh9Ivao(MinZ<4<&*nBUMx72on>(#NOo}MKcBo-MH z)fTI;k}}fAxBu05N0fJ&?noc-oL(GF(2wo_^eYx}6)sEUq&M8ISz1mLc}-@nTh;9g zHM?t2q@D(J@rU<7E7^8XlvvO#XxXnq5QdWS)9-XJ==8wksVTdrB%w%6ztYhKGS!(T zjMWrP;fq)65_u*VuOa8!3F(KgSP&+xx3G(pAQ-Ts*+EuU25*fOARPMFBfm}R`b=oR zD!d1EhRsxPF-Oq9gCHD9ka#8lL8)-O)wC(qv#WHvE8gnQ24JML1`L|K-+~eEmIl?9 zWnb?HFSI0-5^J)38En6Rd60s)eu+S?s%l2sDrqhjW0yngJm=culv`jHEU&X3pRCr?tPq2ZH)oK@KCz4$ z$#4|)hp}ev##|1gH(tBLY2J@_chIk2)fWo&QQ~6Bnhc~NRwL?*_VlX5?mC9)Yb8O# z#=>CHCjyhhV15{0+J`X)pTme4Jd_+Q8^Lg zDRQX!FpyU_6{a&BsX_Vdsbu+OMU~#xvo{wuxO66qq!hF%(7`vxN1b62KM2l<3ICZW^J?@dte?A-1K16yvY$m&KYHD=+)>R zXmW&U#Fj163pDgTWn&Gv$Qo_26;jlqU2&2e54P2-y*keQus2g=jcsh2{?^sZE@3sX zR3KcUNf}RN)0-&AuRga{4Zdr}Qz-sks}wIT%}muXF&oQNoCC|WC(f7K9*nJnp#oRC z^AeLI657%3aoP_nA6AXSbPXbc$#Nwr6osO(P;hp3bK_>bQZ`EqM;#s0qL=O-bN{kD z2MSV~#iGEC+TL(+?~n@V62NMQoMH0b-`~tj_?(B9v?BQkEw|rz;J}bwAxi*(-vmeW zGw$m&NY~y%=Q&Z&sc!RJNpZmCJ%!v?{$x3Yxkd{5CJ+;>CBuKKq&K)+X8zjfO(JRNf z(Qm_o|CoeeLf-}ssVn{tSb0JR+2G}tm4;1}EUh|qfAUbj+GVRKSA(Hf0Gow3zdh)& z0f+b}CXJOGnc-FesTL8c24Mt=WO?{)C~i?Kxk55Ii3Mh=bBFf>(8+83(sc=I7;yT* z-IoebY^9{ONh%KgrkvNn%UFR|b_c|EU*oo<^r{GOE8nXqQVo_RMn}`pljb2dQA+}5 zisoqN;C0yrm{U*Hy!NPb=4Bi$=ChrE3R?HSKwem(4sEUzMC}(r+j(WcN~OWdrL{r&X73uVjZVyA8l0QatpqDOdRT4Mub5 z4!x}zjMi5UK<~k|T1q_&B+qucWtyflctxHt$c48_*q4W%!1jAHrbTBFYb>3w&9x)L5K^85fG(fs)nK93k=zu z<6oR>qo^e~B%ltjV#v8>6}xyW(i3%Fq$10Hk|YkRaUk?TCW@a=`wE-g8j}xkMfYCY z(sf{_;7}E=o-uTCyn^&v6TYnu%+eV^(Sb=X_ZOj%yVG*_vZ&kSu4tEe z&Yfsv=!5E+65ArY9(Tn}O+G+Ev9f9|Fq2vx{J7yiIAjPC*I^22l*}3^4Cu9MwDd70+K}gk5X!;%PhOOQg z9iE=8Ex;Uo-hRs<8oo~Xrzdcac{d|BkY1g2=WT|%FC-b|J82zSc~FXS_Q zY|TWxjR_VGtiq1X#88t{lI=}f;`3-_Da;c*PO`(6*$#p0SgGvcZ*^G#>txZ-rJ_MIDKF4j=(KGEffjXky;?A zic&&*c+jJm0!PX!W5}*K_ibBmlz>y$ukjl*U3_K2+}XT1#%(8sBRUe<6P`mi<+~-C zbhM&@#EDQYB1;GifHmS9qf8r{ehG;~8USr9AVGQd!?YR zOKq*@VW9mm2g@&CS{H*}Ti>Cm1v+^`U}rLM^)izb(ow}qESA%Z&dI_@!>Wv&;Nx0# z;2@UTqe=eo=q}M za(f)Z6#x%vok8B8NPi&n=3>4va;(k;V0R9>0yzs=FY%+SRkBp;%M{4Zb!ObsoT`Gw zPq=z=p*jd~h)Zrxh2bk_f7#DtoPjJTp@ax>iHEFZh?V~W(kZ=#?2PWeqqR4&%Uk3U zy@QFJNUJlqIYTg5w#mC*s6&3leNAoS@fhV%9IxeyK?2`(WQ>3qaaev?N>eO%I(Nuy zB&2vi6gN|^C611^xx0FA6AqDXG~>!*v=6bo5R?#bhzJ3@sw!U#rqb3&rr~{ZKiS?l zlffV6R8y&NjFCFm$#x3*j5?_sH1{*=1HVQ6kMWEjwD#Yd{THy?pslh{C@i0_mS=0O zU{p3o5RX$KtYBz3DYCb-isOhsH;3T{fDfoA5XOAMTGxdyv*h!wrw6!gNEgIs#70Co zkOlbGeim(PDWLQas_ChT9>LPMc7>PqdI^_?_Fdz?4!nhW%|oCOpQwmS?H!7|k(rd| z(>mk%9r7$YNXHJeEzKn8a<{1&t;07ijk!@cie@1}dp!*nAA_WuSsM*8NF#6dk15bN zN`06v8w+^_m}ho-rBvs%%s&a{J4W3dZI?foh4Z^;TXJhh!2z`_+#h;hfr4Ohv&)Br zv9-;TX*Az(VA)w8V)|8tvpK)V&VHkP1gQIrv5%W(Am9_eb-%@!>`yye#=+zps7?yc zw;@K_;22O2K@O4oM{HMH`V|&3Q-hohIluLdqNAC-`lFN&Qk}2dn9lyX56hu@lf>cE zuMee7TCXn-zXG=-I!pEIEecF_zzIDFi%z658EPE!3SDzwg9_zQ6WgVRfeZ4S3W&#R zuwT2*?Mg0uZBAkpD#A?B#%xkRGM{}*{I1?a>zJ>Jor}ZR7N|_<%--KSUqiWUn-qrzCzZt^8qHdU@T;{=8r!GZj7BPm4wI+aMqHpB7B$ z?^2DwkAiIFv)=Kt7JMlwC8gW}WI!v}2`!y2Pnr)Pq>u>LFHyRNgtWyW{*^`rjQ4e< zU|PBo4XRq>MT^JH$;#|aANgx37$F!z9EKWv-5!nZWW&>569+IK4I0Qx;`pJa1JZ>1 z?ED~w=wM5_nyPxU`yGjRn1X03R~;i#xzHukXbc^?%)1&ueLN9n8@Mp2jtUlOYa-j*=c?i>`sAC54VeHgUBd7quEHVqwUAH1sjP&^1S@GBE-I z3qfDIDY>0eenQ|X&|_PntVNKA(|Q*aWnV`&-dpzh#Ur$sW&qwb)_Q#EDiODHXIF}) z|A&JZbPJ!=ksF`CLJrg(A7-GRFkbuZq4=ZGsqAQG`FFq}UPav&TN#bVs%Sc9!e6*D zEd2~iFbWqO(L~?QQalYqvl5w~gK!kUOlr)&?`7SdwHwk00K)d8uGW!3m@fRDFRn_8 zBBApb{U|=3!1(R(U(Upo0~>CNXkX-8@hiLE(B7mstA=lB+Ak-3MndmB+$G2Ig(Woe>~dEDC5Pc1h1qRDpe|ML5hLv+wi1G* z6TSihUe$$Q$M&myQaEKv#mlPY<8`3@hp zIYmdMn(pQ={Y}u8y+KomPfC;EE(*xh#kJC?UUWLiEWXT=rmCko#B7+idv~e|4A}qB{qS|Na8wNzxVD9~Ng{)DGlVRtS$omW4%#+i7SpyTQW$I6(7>*xE z#j6Q4Q(pGnfZ|yaAdl=%s#oh_>hvIfh8>f)6#_VMncv^RK=D_tW}!Yllra)jovJc) zW#0EP)}J~T7U0PJC~Ba4#z0o`C71!4dFvXZ$)>+dEh8@a&YOve8n4Wbr|S$Yx1_B* zg>f>krB?)%IxfX*#c2CLwgj^!%}B1IyTdyq36lQ^c1{P>sKsn#zIvmbQjQ}*0f%b) z4Y8Z&RW2vD)5|S2Tq`9!;hdO8V~OhSfCA~yxPg#y&2WGDn=Eeekdx3UeJ$znPo z#s+{eq5uP-cHEcTVk0K~bg@{+#cxRnx+vujLu697s!Bk@FJ_V|pzvl>*EyzcSe8b# zy9~B8i~4Mhb#V<1vU)8XoQt&1{OMIX#`!;a%K3nX#(aqES3$HZ(()Igl#$?8T0POs z)-8o<3e-P5=&N?_83@sjO|{gz-nF=mi72iRDY%h@Yhw8#*{A5L(Z$S_(c^%XF?;q@ z7jTB8Gjj&zUAoTB<^6Wo5ykBm*SmZjo=c|(-$^SHn}T~jy5)sqm|k3v9j;HOg%W+j zu@fD|s@c@k#Q57|E+_)*Sz31AS8EVm?`jH{C+tAPicm|wY-stt9J-6Yy+J)*qTwNK z2;G#QOdLYg7vHs!bprqF0g298f3fIl-V*E(Ib0-`<3M`Z17o9ooQBj}jjlD71Qq5r zTq@nbE5*c$mFE0~YkI}gJ$nz+0xpj01S!y%ra!{XSVF#yHh!Dc9dee=Aab5YK9xBX z)y_4=oF`tLDkW0FcF7T4kcyFPTx69zb(?$?)pX4tB%Z3&8A17$x^TB#{y{JnEVmt> z7nVg7Q50sGWzs@=uR|q=QS!YNZ+jFx!tyN>kunQ|sJKB1DO3r07zhgsT}Q|UR&Iz6 zwHvAoko659JfhJ$Bhb_b6-14QInm%_|8YvhRP$k8qOtp21zzVkHs_hr`Tr z-1Uzqwx|~GKknLL9v`VJYL2B_y>MZ}%x`l)IdY257bl)c30E^=A+p=azjhjd=e={y z8Fzno;_G})QW4b5^%@Q)#+qFp!^19agCYFu1o4~Tiimo|uM>|q2#)~jbH0mvman7A z5^uozQ}jdkMpzUfvjc4J_fKjk4g%lKz%_2;W#12 zdr$n{e;_zLY_1vStVjw0eijik714$ip0ZwhWpMBc_v#9yw1`tu^Q4=R(haH4A_kJ1 zhM2k136C};T=`2@LFkMS%K3^*)>Q_%yAID8+Jd!`<`e>>NENNQt0r5`iAM)|XEQ4Ee&>LOxja8J!M?K_~ zJiS&iBU@jj>o$}?=&ggByaD1|E&P--A$wf%K9G~n<%wHJ$w=f0PGknta$j4U4wQKL z;Ey-NgUl0zo<@{hqEpxf^iR`u6%p{b$uplN3HkUlngqy;ZSJri?0dj+|o2wbSS5THJf z;i^KCiXB`%UB@B{M5}u#uwYX5AtOMZj4dGVHY2{rTM!|WuCfT0Eo7~mLTc3G5&qdu zff>cWJ$cFy*TVfSaP!AHDWm6%!*A-OnEzzxd}APNWZ-1-L-ry(dPuU1A0_ZnVxhO! zv}MY@%{P%v5?t6ZyZ)?-s!<+_Zql)EJcU2zUJEL8t@A0>+|3+2=O-FP$ZRs2_Q7bdDa%Q_zqYU}w7O%|C1~xs>=RkDZ zw%PD{>|49NddA2F7cFiGz8&(M>BF?asP?dk;4xH}28|&i_MA_CMKHz^6tuEaSB6$d z$%z8=jy=ib*^+M}oc8rPx~o8eh0sDV4AdUcX}jjK9z_mS>f=&|;_|QDYiGKtcogw2 zKV^?+MvrFZ;bmT?H6X zn&&dBw=X17_R19u6&_21%y|Tv9{?#be6zBgLS*E*}~ z)9M9Y5ggCp9(C*+rnxk1|L$x~3*kb4sTYX-t-z8#1kRyKmtHVB+~q6n7Zd5B&Z{)L z#Ssc@2gNX<){BAF3gaW@-kHAJn0`dvJe(#fGA7|2nUd(3x#0`E)1hd??<=P{7MKrS z+-HbH`wEukYKpX2+poe(%J$S?=0h9H6tmH2Qcu5^)u!i6Y4ItvVx!p|;j&TM@)wQ~ zcQPK{b^9bgKVpa>o7W_RT(zi9tUY*Upg{HEVQh(oKnAb2#g3A+F-Q~KmBv!n)^O8F zsLphhur4!Cb!efw1^C@oNxp7W4r|$1UZy{9W7o%~dW;*5yiZ3 z?jLzESFz{B0Q2F5pCp(d9OW>VV>)i%4#@kK1NYbyN4^BHGO&Y#d*1sT&D5v{Y^q!@ zQ+VOE_<3}?zdtrcZu*3@AdFDWIgnl5YmsE6QbryAk+jZ&h>Xtih;%`&a`b}gcA3F6 zvSv&{35DgF!cw-errNuRH_Vlrd%TsKr{1ADJr#@U7Vms~KfP*-r}3MQm?N&=!P9wX zsiTJ0ztXY0H{4u^U}IdnZipW7Ac%1cu)%lsn#LIfQ|KH?+|TgBk7hDCo{m5Zd&RYx zICu+mzzHOI4~EE1;AA}cijDvg-G8N8^N@M_)@-CW86HBMJUKJC&;-J8&m;2nBgqBu zIawmL)anbo_5Lk!+CH&}PcR*IOXyvG#@eo5N?PULfQ!go@9di;;br=EttTNVCU>~piick+FD{B`sX ztqcFm=DB&{JJmlu{v(@jtqg!bC;;D;){mvb&&>?q>Eh|}x2*n8Ys2rbdcIV@Qzqyi zc>kvq`RB?0SmE^?V*5^O|Bm7RElqx&^N)D^Sg-Um9(geTYR*3tj{VB}$AX8Sr_c3d zko*?wZ+QIQ`lnw-{8*Uq91HkP%1D0@@q;DuE7u>hrO)T%J0T$df$L8t4!`pKF_HH3 zY{$|5!1ssD>oeDX(h5Iwg?l=4zlHh7ukfl>P^<-&1tIV)0`ZF<9rT1eAbjTfPY3H~ectz^6@JV0o5%C(G=H?EpPi=f1n~sNzhL;Q3-zmj lAB~5f4=pt99|ZhY16^JU^vMhX0Kk0u_(A{xcrZNw`hOqbCC>l= literal 0 HcmV?d00001 diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/base/Base.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/base/Base.java index 42678d635f..a4b6241c08 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/base/Base.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/base/Base.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import io.nuls.contract.model.bo.Chain; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.vm.program.ProgramMultyAssetValue; @@ -346,6 +347,10 @@ protected Map makeCallParams(String sender, BigInteger value, Long gasLimit, Str } protected Map makeCallParams(String sender, BigInteger value, Long gasLimit, Long gasPrice, String contractAddress, String methodName, String methodDesc, String remark, ProgramMultyAssetValue[] multyAssetValues, Object... args) { + return this.makeCallParams(sender, value, gasLimit, gasPrice, contractAddress, methodName, methodDesc, remark, multyAssetValues, null, args); + } + + protected Map makeCallParams(String sender, BigInteger value, Long gasLimit, Long gasPrice, String contractAddress, String methodName, String methodDesc, String remark, ProgramMultyAssetValue[] multyAssetValues, AccountAmountDto[] nulsValueToOthers, Object... args) { Map params = new HashMap<>(); params.put(Constants.CHAIN_ID, chainId); params.put("sender", sender); @@ -359,6 +364,7 @@ protected Map makeCallParams(String sender, BigInteger value, Long gasLimit, Lon params.put("args", args); params.put("password", password); params.put("remark", remark); + params.put("nulsValueToOthers", ContractUtil.nulsValueToOthersStringArray(nulsValueToOthers)); return params; } diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java index 7d28f8c7b1..0f9fd82a04 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java @@ -61,6 +61,7 @@ import org.junit.BeforeClass; import org.junit.Test; +import java.math.BigDecimal; import java.math.BigInteger; import java.util.*; @@ -82,9 +83,9 @@ public static void initClass() { @Test public void importPriKeyTest() { - importPriKey("b54db432bba7e13a6c4a28f65b925b18e63bcb79143f7b894fa735d5d3d09db5", password);//打包地址 tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp + //importPriKey("b54db432bba7e13a6c4a28f65b925b18e63bcb79143f7b894fa735d5d3d09db5", password);//打包地址 tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp //importPriKey("188b255c5a6d58d1eed6f57272a22420447c3d922d5765ebb547bc6624787d9f", password);//打包地址 tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe - //importPriKey("fbcae491407b54aa3904ff295f2d644080901fda0d417b2b427f5c1487b2b499", password);//打包地址 tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF + importPriKey("fbcae491407b54aa3904ff295f2d644080901fda0d417b2b427f5c1487b2b499", password);//打包地址 tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF importPriKey("9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b", password);//25 tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG importPriKey("477059f40708313626cccd26f276646e4466032cabceccbf571a7c46f954eb75", password);//26 tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD @@ -165,6 +166,16 @@ public void transfer() { System.out.println(transferService.transfer(builder.build(new TransferReq())).getData()); } + @Test + public void transferOne() { + String from = "tNULSeBaMtkzQ1tH8JWBGZDCmRHCmySevE4frM"; + String to = "tNULSeBaNRJrWyAfNtA6aiAozaJdemWA5WbBFU"; + TransferReq.TransferReqBuilder builder = new TransferReq.TransferReqBuilder(chain.getChainId(), chain.getConfig().getAssetId()) + .addForm(from, password, new BigDecimal("100.001").movePointRight(8).toBigInteger()) + .addTo(to, new BigDecimal("100").movePointRight(8).toBigInteger()); + System.out.println(transferService.transfer(builder.build(new TransferReq())).getData()); + } + @Test public void transferMultyAsset() { TransferReq.TransferReqBuilder builder = new TransferReq.TransferReqBuilder(2, 3) @@ -209,14 +220,20 @@ public void transferMultyAsset() { System.out.println(transferService.transfer(builder.build(new TransferReq())).getData()); } + protected boolean syncKernel = true; @Before public void before() throws Exception { - NoUse.mockModule(); - ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); + updateSyncKernel(); + if (syncKernel) { + NoUse.mockModule(); + ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); + } chain = new Chain(); chain.setConfig(new ConfigBean(assetId, chainId, 100000000L)); } + protected void updateSyncKernel() {} + protected TransferService transferService = ServiceManager.get(TransferService.class); @@ -226,13 +243,30 @@ public void getBlockHeader() throws NulsException, JsonProcessingException { Log.info("\nstateRoot is " + HexUtil.encode(ContractUtil.getStateRoot(blockHeader)) + ", " + blockHeader.toString()); } + @Test + public void getAgentInfoForContractTest() throws Exception { + Map params = new HashMap(); + params.put("chainId", 2); + params.put("agentHash", "89109b062f7bf611421ac3c8c456ab29e8bf71b5f38622ede4943ec8a8f2a0cb"); + params.put("contractAddress", "tNULSeBaN3wibWfHcc1YhvszihX9eLS4ruueXY"); + params.put("contractSender", "tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG"); + Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_getContractAgentInfo", params); + Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get("cs_getContractAgentInfo")); + Assert.assertTrue(null != result); + Log.info("accountContracts-result:{}", JSONUtils.obj2PrettyJson(cmdResp2)); + } + @Test public void getBalance() throws Exception { + // tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7 + // tNULSeBaMfXDQeT4MJZim1RusCJRPx5j9bMKQN //this.getBalanceByAccount("tNULSeBaNBJT6JuznGqhKM5q6jXFkuSoMUNkHK"); System.out.println("---------------------------------------------------"); //this.getBalanceByAccount("tNULSeBaNAFAVPbGHAzCJ8YZhXLbxK44EujNKF"); System.out.println("---------------------------------------------------"); - this.getBalanceByAccount("tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp"); + this.getBalanceByAccount("tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7"); + this.getBalanceByAccount("tNULSeBaMfXDQeT4MJZim1RusCJRPx5j9bMKQN"); + this.getBalanceByAccount("tNULSeBaNAEf7r7pk63xtGixpTJCPCPkm5DtZf"); } protected void getBalanceByAccount(String account) throws Exception { @@ -251,7 +285,7 @@ protected void getBalanceByAccount(String account) throws Exception { Map balance1 = LedgerCall.getBalanceAndNonce(chain, chainId, 2, account); System.out.println(String.format("MTA balance: %s", JSONUtils.obj2PrettyJson(balance1))); Map balance2 = LedgerCall.getBalanceAndNonce(chain, chainId, 3, account); - System.out.println(String.format("MTA balance: %s", JSONUtils.obj2PrettyJson(balance2))); + System.out.println(String.format("MTA3 balance: %s", JSONUtils.obj2PrettyJson(balance2))); } @Test @@ -307,7 +341,7 @@ private Map makeContractInfoParams(String contractAddress) { */ @Test public void contractResult() throws Exception { - Object[] objects = getContractResult("edf019bbc5070181fae5fd97cf89d8574e53595686c336540934849981d3ade1"); + Object[] objects = getContractResult("a92f2928b6c3ee3944a8e0c7e895f4185fb1b9991f82ca5dac1efe82a6adadec"); Log.info("contractResult-result:{}", JSONUtils.obj2PrettyJson(objects[0])); Assert.assertTrue(null != objects[1]); } @@ -344,7 +378,7 @@ public void contractTx() throws Exception { public void getTxClient() throws Exception { Map params = new HashMap<>(); params.put(Constants.CHAIN_ID, chainId); - params.put("txHash", "f0de6f185c99dd2c8b20ec0a17e83d8278552fe5aaf4ed45e3f436ddaccbc8d1"); + params.put("txHash", "dddc5949ca4986528741c839e9131450c52fd684836622ad18222c3d959833f8"); Response dpResp = ResponseMessageProcessor.requestAndResponse(ModuleE.TX.abbr, "tx_getTxClient", params); Map record = (Map) dpResp.getResponseData(); Map resultMap = (Map) record.get("tx_getTxClient"); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java new file mode 100644 index 0000000000..1d647d457f --- /dev/null +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java @@ -0,0 +1,122 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.tx.contractCreate; + +import io.nuls.contract.tx.base.BaseQuery; +import io.nuls.contract.util.Log; +import io.nuls.core.parse.JSONUtils; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.message.Response; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; +import org.junit.Test; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static io.nuls.contract.constant.ContractCmdConstant.TOKEN_TRANSFER; + +/** + * @author: PierreLuo + * @date: 2019-12-06 + */ +public class ContractCreateSendTxTest extends BaseQuery { + + String contractA = "tNULSeBaMwJNC9FUQbiTk2mnCLqYSnF1Ub7nt5"; + + @Test + public void createAndInit() throws Exception { + this.contractA = createContractA(); + System.out.println(contractA); + } + + @Test + public void testCreate() throws Exception { + Map resultA = this.invokeCall(sender, null, contractA, "createContract", null, null, + new String[]{"tNULSeBaMy3Tw7pHNDYwSMaewDypQMdNywXXUJ", "tccc5", "777"}); + resultCheck(resultA); + } + + @Test + public void testCreate2() throws Exception { + Map resultA = this.invokeCall(sender, null, contractA, "createContract2", null, null, + new Object[]{"tNULSeBaN8KDbAPBme3tPNUd69pWSZsqYPz3ym", "pocm0", new Object[]{"tNULSeBaMy4cmp1uhrDPDLBGhXSixFQ8e32JJp", 0, 0, 20000000, 200000000000000L, 1, 10000000000L, true, false, "a"}}); + resultCheck(resultA); + } + + @Test + public void testASD() throws Exception { + Map resultA = this.invokeCall(sender, null, "tNULSeBaMxq6jYc7TeRfeMb8EHHHaiXqC1A6TQ", "submit", null, null, + new String[]{"aaa", "111"}); + resultCheck(resultA); + } + + @Test + public void invokeViewTest() throws Exception { + String view = this.invokeView(contractA, "codeHash", List.of("tNULSeBaN1yJ1rZmwCwGjoRs86cajmbBWZ6he5")); + System.out.println(view); + } + + /** + * token转账 + */ + @Test + public void tokenTransfer() throws Exception { + String token = "tNULSeBaN1t29KzTAVQMKaYup5uyK7raQUGoNY"; + String to = "tNULSeBaNRJrWyAfNtA6aiAozaJdemWA5WbBFU"; + BigInteger value = new BigDecimal("10").movePointRight(8).toBigInteger(); + String remark = "token transfer to " + to; + Map params = this.makeTokenTransferParams(sender, to, token, value, remark); + Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, TOKEN_TRANSFER, params); + Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(TOKEN_TRANSFER)); + assertTrue(cmdResp2, result); + String hash = (String) result.get("txHash"); + Log.info("contractResult:{}", JSONUtils.obj2PrettyJson(waitGetContractTx(hash))); + } + + private void resultCheck(Map resultA) { + Map contractResult = (Map) resultA.get("contractResult"); + if (contractResult.get("flag") != null) { + contractResult = (Map) contractResult.get("data"); + } + boolean success = Boolean.parseBoolean(contractResult.get("success").toString()); + Assert.assertTrue("expect success, " + contractResult.get("errorMessage") + ", " + contractResult.get("stackTrace"), success); + } + + + private String createContractA() throws Exception { + Log.info("开始创建虚拟机测试合约A"); + InputStream in = new FileInputStream("/Users/pierreluo/IdeaProjects/contract-vm-testA/target/contract-vm-testA-testA.jar"); + byte[] contractCode = IOUtils.toByteArray(in); + String remark = "create test A"; + return this.invokeCreate(sender, contractCode, "test_a", remark); + } +} diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java index a6b51d7606..2c2b9f95ba 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java @@ -203,7 +203,7 @@ protected Result makeCallTx(int chainId, String sender, } byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); byte[] senderBytes = AddressTool.getAddress(sender); - return contractTxHelper.newCallTx(chainId, sender, senderBytes, value, gasLimit, price, contractAddressBytes, methodName, methodDesc, args, remark, null); + return contractTxHelper.newCallTx(chainId, sender, senderBytes, value, gasLimit, price, contractAddressBytes, methodName, methodDesc, args, remark, null, null); } protected Result broadcastCallTx(CallContractTransaction tx) { diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java index 8f55973a2f..4164ca1ec1 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java @@ -24,20 +24,38 @@ package io.nuls.contract.tx.multiSign; import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.CoinData; +import io.nuls.base.data.CoinFrom; +import io.nuls.base.data.CoinTo; +import io.nuls.base.data.Transaction; +import io.nuls.base.signture.MultiSignTxSignature; +import io.nuls.base.signture.P2PHKSignature; +import io.nuls.base.signture.SignatureUtil; +import io.nuls.contract.model.txdata.CallContractData; +import io.nuls.contract.rpc.call.TransactionCall; import io.nuls.contract.tx.base.BaseQuery; +import io.nuls.contract.util.ContractUtil; +import io.nuls.contract.util.LedgerTestUtil; import io.nuls.contract.vm.util.JsonUtils; +import io.nuls.core.constant.TxType; +import io.nuls.core.crypto.ECKey; +import io.nuls.core.crypto.HexUtil; import io.nuls.core.log.Log; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; +import io.nuls.v2.model.dto.RpcResult; +import io.nuls.v2.util.JsonRpcUtil; import org.junit.Test; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -48,6 +66,36 @@ */ public class MultiSignTxTest extends BaseQuery { + static int chainId = 2; + static int assetChainId = 2; + static int assetId = 1; + static String rpcAddress; + + private void setDev() { + chainId = 2; + assetChainId = 2; + assetId = 1; + } + + private void setTest() { + chainId = 2; + assetChainId = 2; + assetId = 1; + rpcAddress = "http://beta.api.nuls.io/jsonrpc"; + } + + private void setMain() { + chainId = 1; + assetChainId = 1; + assetId = 1; + rpcAddress = "https://api.nuls.io/jsonrpc"; + } + + @Override + protected void updateSyncKernel() { + this.syncKernel = false; + } + @Test public void createMultiSigAccountTest() throws Exception { //create 3 account @@ -66,6 +114,81 @@ public void createMultiSigAccountTest() throws Exception { Log.info(JSONUtils.obj2PrettyJson(cmdResp)); } + @Test + public void callContractByMultiAddress() throws Exception { + setTest(); + String multiAddress = "tNULSeBaNRJrWyAfNtA6aiAozaJdemWA5WbBFU"; + String contractAddress = "tNULSeBaMxCJQwsXpY3xfo6nwY3k8tRacs9pBH"; + byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); + byte[] multiAddressBytes = AddressTool.getAddress(multiAddress); + Transaction tx = new Transaction(); + tx.setType(TxType.CALL_CONTRACT); + tx.setTime(System.currentTimeMillis() / 1000); + tx.setRemark("multi address call test".getBytes(StandardCharsets.UTF_8)); + CoinData coinData = new CoinData(); + //byte[] nonce = HexUtil.decode(LedgerTestUtil.getUnConfirmedBalanceAndNonce(chain, chainId, assetId, multiAddress).getNonce()); + //if (null == nonce) { + // nonce = HexUtil.decode("0000000000000000"); + //} + byte[] nonce; + RpcResult request = JsonRpcUtil.request(rpcAddress, "getAccountBalance", List.of(chainId, assetChainId, assetId, multiAddress)); + Map result = (Map) request.getResult(); + String nonceStr = (String) result.get("nonce"); + if (null == nonceStr) { + nonce = HexUtil.decode("0000000000000000"); + } else { + nonce = HexUtil.decode(nonceStr); + } + + long gasLimit = 200000L; + long gasPrice = 25; + coinData.addFrom(new CoinFrom(multiAddressBytes, chainId, assetId, new BigDecimal("0.001").movePointRight(8).toBigInteger().add(BigInteger.valueOf(gasLimit * gasPrice)), nonce, (byte) 0)); + //coinData.addTo(new CoinTo(multiAddressBytes, chainId, assetId, BigInteger.ZERO, (byte) 0)); + tx.setCoinData(coinData.serialize()); + CallContractData callContractData = new CallContractData(); + callContractData.setContractAddress(contractAddressBytes); + callContractData.setSender(multiAddressBytes); + callContractData.setValue(BigInteger.ZERO); + callContractData.setPrice(gasPrice); + callContractData.setGasLimit(gasLimit); + callContractData.setMethodName("transfer"); + String[][] args = ContractUtil.twoDimensionalArray(new String[]{"tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG", new BigDecimal("3").movePointRight(6).toPlainString()}); + if (args != null) { + callContractData.setArgsCount((short) args.length); + callContractData.setArgs(args); + } + tx.setTxData(callContractData.serialize()); + String[] pubkeys = new String[]{ + "03958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e3", + "0318f683066b45e7a5225779061512e270044cc40a45c924afcf78bb7587758ca0", + "02c2b4e37fa297879c3ed824d021c0ee4692c6f87fcaf1681d712ccd485784b9bd"}; + List pubkeyList = Arrays.asList(pubkeys); + List collect = pubkeyList.stream().map(p -> HexUtil.decode(p)).collect(Collectors.toList()); + MultiSignTxSignature transactionSignature = new MultiSignTxSignature(); + transactionSignature.setM((byte) 2); + transactionSignature.setPubKeyList(collect); + tx.setTransactionSignature(transactionSignature.serialize()); + + List p2PHKSignatures = new ArrayList<>(); + List priKeyList = new ArrayList<>(); + priKeyList.add("9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b"); + priKeyList.add("477059f40708313626cccd26f276646e4466032cabceccbf571a7c46f954eb75"); + priKeyList.add("8212e7ba23c8b52790c45b0514490356cd819db15d364cbe08659b5888339e78"); + for (String pri : priKeyList) { + ECKey eckey = ECKey.fromPrivate(new BigInteger(1, HexUtil.decode(pri))); + P2PHKSignature p2PHKSignature = SignatureUtil.createSignatureByEckey(tx, eckey); + p2PHKSignatures.add(p2PHKSignature); + transactionSignature.setP2PHKSignatures(p2PHKSignatures); + } + tx.setTransactionSignature(transactionSignature.serialize()); + String txHex = HexUtil.encode(tx.serialize()); + System.out.println(String.format("txHash: %s", tx.getHash().toString())); + System.out.println(String.format("txHex: %s", txHex)); + //TransactionCall.newTx(chainId, txHex); + RpcResult newTx = JsonRpcUtil.request(rpcAddress, "broadcastTx", List.of(chainId, txHex)); + System.out.println(JSONUtils.obj2PrettyJson(newTx)); + } + public SimpleAccountDTO getAccountByAddress(int chainId, String address) throws Exception { Map params = new HashMap<>(); params.put(Constants.CHAIN_ID, chainId); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java index d2a3dd0227..a8da8a6a5a 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java @@ -31,6 +31,7 @@ import io.nuls.base.data.CoinTo; import io.nuls.contract.mock.basetest.ContractTest; import io.nuls.contract.model.bo.ContractBalance; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.model.tx.CallContractTransaction; import io.nuls.contract.model.txdata.CallContractData; import io.nuls.contract.rpc.call.LedgerCall; @@ -105,8 +106,8 @@ public void createContract() throws Exception { @Test public void assetRegisterTest() throws Exception { Map params = new HashMap<>(); - params.put("assetSymbol", "MTAX"); - params.put("assetName", "MTAX"); + params.put("assetSymbol", "MTAX3"); + params.put("assetName", "MTAX3"); params.put("initNumber", 100000000); params.put("decimalPlace", 8); params.put("txCreatorAddress", sender); @@ -139,7 +140,7 @@ public void nulsTest() throws Exception { @Test public void otherAssetTest() throws Exception { // 转入 3.2 - this.callOfDesignatedAssetByParams("_payableMultyAsset", "3.2", null, 2, 2); + this.callOfDesignatedAssetByParams(contractAddress, "_payableMultyAsset", "3.2", null, 2, 2); // 转出 1.1 Object[] args = new Object[]{toAddress17, new BigDecimal("1.1").multiply(BigDecimal.TEN.pow(8)).toBigInteger(), 2, 2}; this.callByParams("transferDesignatedAsset", "0", args); @@ -197,7 +198,7 @@ public void innerCallWithReturnValueOfDesignatedAsset() throws Exception { String methodName = "callWithReturnValueOfOtherContractOfDesignatedAsset"; // 转入 6.6 2-2 (外部合约) - this.callOfDesignatedAssetByParams("_payableMultyAsset", "6.6", null, 2, 2); + this.callOfDesignatedAssetByParams(contractAddress,"_payableMultyAsset", "6.6", null, 2, 2); // 转入 6.6 2-2 (内部合约) this.innerCallOfDesignatedAssetByParams(methodName, otherContract, "_payableMultyAsset", null, "6.6", 2, 2); @@ -209,6 +210,37 @@ public void innerCallWithReturnValueOfDesignatedAsset() throws Exception { this.innerCallOfDesignatedAssetByParams(methodName, otherContract, "transferDesignatedAssetLock", innerArgsLock, "0", 0, 0); } + /** + * 调用合约的同时，向另外一个账户转账 + */ + @Test + public void callContractWithNulsValueToOthers() throws Exception { + sender = "tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"; + contractAddress = "tNULSeBaNAEf7r7pk63xtGixpTJCPCPkm5DtZf"; + + //BigInteger value = new BigDecimal("6.6").movePointRight(8).toBigInteger(); + BigInteger value = new BigDecimal("0").movePointRight(8).toBigInteger(); + methodName = "_payableMultyAsset"; + // "tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7", + // "tNULSeBaMfXDQeT4MJZim1RusCJRPx5j9bMKQN" + AccountAmountDto[] amountDtos = new AccountAmountDto[]{ + new AccountAmountDto(BigInteger.valueOf(300000000L), "tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7") + }; + ProgramMultyAssetValue[] multyAssetValues = new ProgramMultyAssetValue[]{ + new ProgramMultyAssetValue(BigInteger.valueOf(2_0000_0000L), 2, 2), + new ProgramMultyAssetValue(BigInteger.valueOf(3_0000_0000L), 2, 3) + }; + String methodDesc = ""; + String remark = "call contract test - 向合约转账的同时，向另外一个账户转账"; + Map params = this.makeCallParams( + sender, value, 2000000L, 25L, contractAddress, methodName, methodDesc, remark, multyAssetValues, amountDtos, new Object[]{}); + Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CALL, params); + Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CALL)); + assertTrue(cmdResp2, result); + String hash = (String) result.get("txHash"); + Log.info("contractResult:{}", JSONUtils.obj2PrettyJson(waitGetContractTx(hash))); + } + /** * 根据注册资产的交易hash查询资产信息 */ @@ -313,6 +345,12 @@ public void transferOutOfmanyAccountCall() throws Exception { this.callTxOffline(feeAccount, feeAccountPri, sender, senderPri, value, contractAddress, methodName, methodDesc, remark, args, argsType, null, true); } + @Test + public void sendPayableMultyAssetTest() throws Exception { + // 转入 + this.callOfDesignatedAssetByParams("tNULSeBaN7mVkoh9ArP6RGvwgs7wmMpRsD5tuM", "_payableMultyAsset", "1000000", null, 2, 2); + } + protected void callTxOffline(String feeAccount, String feeAccountPri, String contractSender, String contractSenderPri, BigInteger value, String contractAddress, @@ -553,7 +591,7 @@ protected void callByParams(String methodName, String valueStr, Object[] args) t Log.info("contractResult:{}", JSONUtils.obj2PrettyJson(waitGetContractTx(hash))); } - protected void callOfDesignatedAssetByParams(String methodName, String valueStr, Object[] args, int assetChainId, int assetId) throws Exception { + protected void callOfDesignatedAssetByParams(String contractAddress, String methodName, String valueStr, Object[] args, int assetChainId, int assetId) throws Exception { BigInteger value = new BigDecimal(valueStr).multiply(BigDecimal.TEN.pow(8)).toBigInteger(); Map params = this.makeCallParams(sender, null, gasLimit, gasPrice, contractAddress, methodName, null, "", new ProgramMultyAssetValue[]{new ProgramMultyAssetValue(value, assetChainId, assetId)}, args); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CALL, params); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java index a47e02fe64..a630688b08 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java @@ -214,7 +214,8 @@ private Map makeTransferFeeParams(String address, String toAddress, BigInteger a @Test public void tokenBalance() throws Exception { // tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG - Map params = this.makeTokenBalanceParams(contractAddress_nrc20, "tNULSeBaMp9wC9PcWEcfesY7YmWrPfeQzkN1xL"); + contractAddress_nrc20 = "tNULSeBaNBjScvcfjniHFcJ2iyzndUYL3snwQy"; + Map params = this.makeTokenBalanceParams(contractAddress_nrc20, "tNULSeBaN6RsxRsLph4wqmB21jtLZsR2qFct7g"); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, TOKEN_BALANCE, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(TOKEN_BALANCE)); Assert.assertTrue(JSONUtils.obj2PrettyJson(cmdResp2), null != result); @@ -277,6 +278,8 @@ private Map makeTokenTransferListParams(String address, int pageNumber, int page */ @Test public void invokeView() throws Exception { + contractAddress0 = "tNULSeBaN5wa9Eo82aVyn43k3F4UGZYdEvBCsQ"; + toAddress0 = "tNULSeBaN6RsxRsLph4wqmB21jtLZsR2qFct7g"; String methodName = "balanceOf"; String methodDesc = ""; Map params = this.makeInvokeViewParams(contractAddress0, methodName, methodDesc, toAddress0); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java index 5c02fd791d..cd39d03fd0 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java @@ -26,8 +26,10 @@ import io.nuls.contract.mock.basetest.ContractTest; +import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.tx.base.BaseQuery; import io.nuls.contract.util.Log; +import io.nuls.contract.vm.program.ProgramMultyAssetValue; import io.nuls.core.crypto.HexUtil; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; @@ -60,14 +62,14 @@ public class ContractNRC20TokenSendTxTest extends BaseQuery { @Test public void createContract() throws Exception { //sender = toAddress32; - InputStream in = new FileInputStream(ContractTest.class.getResource("/nrc20").getFile()); + InputStream in = new FileInputStream(ContractTest.class.getResource("/nrc20-locked-token").getFile()); byte[] contractCode = IOUtils.toByteArray(in); String remark = "create contract test - 空气币"; - String name = "KQB"; - String symbol = "KongQiBi"; + String name = "NulsSwap"; + String symbol = "NulsSwap"; String amount = BigDecimal.TEN.pow(10).toPlainString(); String decimals = "2"; - Map params = this.makeCreateParams("tNULSeBaMoG1oaW1JZnh6Ly65Ttp6raeTFBfCG", contractCode, "kqb", remark, name, symbol, amount, decimals); + Map params = this.makeCreateParams("tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD", contractCode, "kqb", remark, name, symbol, amount, decimals); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CREATE, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CREATE)); assertTrue(cmdResp2, result); @@ -93,7 +95,7 @@ public void callContract() throws Exception { String methodDesc = ""; String remark = "call contract test - 空气币转账"; String token = BigInteger.valueOf(800L).toString(); - Map params = this.makeCallParams(sender, value, contractAddress_nrc20, methodName, methodDesc, remark, tokenReceiver, token); + Map params = this.makeCallParams(sender, value, "tNULSeBaMy3Tw7pHNDYwSMaewDypQMdNywXXUJ", methodName, methodDesc, remark, tokenReceiver, token); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CALL, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CALL)); assertTrue(cmdResp2, result); @@ -131,6 +133,34 @@ public void tokenTransfer() throws Exception { Log.info("contractResult:{}", JSONUtils.obj2PrettyJson(waitGetContractTx(hash))); } + /** + * 调用合约的同时，向另外一个账户转账 + */ + @Test + public void callContractWithNulsValueToOthers() throws Exception { + sender = "tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"; + tokenReceiver = "tNULSeBaMrbMRiFAUeeAt6swb4xVBNyi81YL24"; + contractAddress_nrc20 = "tNULSeBaN8UY4k5qD9SG8GjMJNKhERBN7cgtEG"; + + BigInteger value = BigInteger.ZERO; + methodName = "transfer"; + // "tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7", + // "tNULSeBaMfXDQeT4MJZim1RusCJRPx5j9bMKQN" + AccountAmountDto[] amountDtos = new AccountAmountDto[]{ + new AccountAmountDto(BigInteger.valueOf(300000000L), "tNULSeBaMkzsRE6qc9RVoeY6gHq8k1xSMcdrc7") + }; + String methodDesc = ""; + String remark = "call contract test - 空气币转账的同时，向另外一个账户转账"; + String token = BigInteger.valueOf(800L).toString(); + Map params = this.makeCallParams( + sender, value, 2000000L, 25L, contractAddress_nrc20, methodName, methodDesc, remark, null, amountDtos, new Object[]{tokenReceiver, token}); + Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CALL, params); + Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CALL)); + assertTrue(cmdResp2, result); + String hash = (String) result.get("txHash"); + Log.info("contractResult:{}", JSONUtils.obj2PrettyJson(waitGetContractTx(hash))); + } + /** * 删除合约 */ diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java index e8301a4a3d..960bfa24cc 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java @@ -26,7 +26,6 @@ import io.nuls.contract.mock.basetest.ContractTest; -import io.nuls.contract.sdk.annotation.View; import io.nuls.contract.tx.base.BaseQuery; import io.nuls.contract.util.Log; import io.nuls.core.parse.JSONUtils; @@ -60,15 +59,22 @@ public class ContractPOCMSendTxTest extends BaseQuery { */ @Test public void createConsensusEnhancementContract() throws Exception { - String filePath = ContractPOCMSendTxTest.class.getResource("/pocmContract-v3").getFile(); - InputStream in = new FileInputStream(filePath); + //String filePath = ContractPOCMSendTxTest.class.getResource("/pocmContract-v3").getFile(); + InputStream in = new FileInputStream("/Users/pierreluo/IdeaProjects/pocmContract-new/target/pocmContract-new-1.0-SNAPSHOT.jar"); byte[] contractCode = IOUtils.toByteArray(in); - String remark = "POCM - consensus enhancement contract test - POCM_共识加强合约"; - // String tokenAddress, BigInteger cycleRewardTokenAmount, int awardingCycle, - // BigInteger minimumDepositNULS, int minimumLocked, boolean openConsensus, - // int lockedTokenDay, String authorizationCode, String rewardHalvingCycle, String maximumDepositAddressCount - Object[] args = new Object[]{"tNULSeBaN152GXtPK5MZX57zeFR7QKvjNKkVA5", 5000, 2, 200, 2, false, 1, null, null, null}; - Map params = this.makeCreateParams(sender, contractCode, "pocm_enhancement", remark, args); + String remark = "POCM new"; + //Address candyToken, + //int candyAssetChainId, + //int candyAssetId, + //BigInteger candyPerBlock, + //BigInteger candySupply, + //int lockedTokenDay, + //BigInteger minimumStaking, + //boolean openConsensus, + //boolean openAwardConsensusNodeProvider, + //String authorizationCode + Object[] args = new Object[]{"tNULSeBaMy3Tw7pHNDYwSMaewDypQMdNywXXUJ", 0, 0, 20000000, 200000000000000L, 1, 10000000000L, true, false, "qwerqwerasd"}; + Map params = this.makeCreateParams(sender, contractCode, "pocm_new", remark, args); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CREATE, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CREATE)); assertTrue(cmdResp2, result); @@ -86,13 +92,55 @@ public void createAgent()throws Exception{ params.put(Constants.CHAIN_ID,2); params.put("deposit","2000000000000"); params.put("commissionRate",10); - params.put("packingAddress","tNULSeBaMvQr8dVnk3f3DPvwCYX3ctTRtrTurD"); + params.put("packingAddress","tNULSeBaMqywZjfSrKNQKBfuQtVxAHBQ8rB2Zn"); + params.put("password","nuls123456"); + params.put("rewardAddress","tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG"); + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_createAgent", params); + System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); + } + + /** + * 创建节点2 + * */ + @Test + public void createAgent2()throws Exception{ + Map params = new HashMap<>(); + params.put("agentAddress","tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"); + params.put(Constants.CHAIN_ID,2); + params.put("deposit","2000000000000"); + params.put("commissionRate",10); + params.put("packingAddress","tNULSeBaMuU6sq72mptyghDXDWQXKJ5QUaWhGj"); params.put("password","nuls123456"); - params.put("rewardAddress",sender); + params.put("rewardAddress","tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"); Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_createAgent", params); System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); } + + /** + * 停止节点 + * */ + @Test + public void stopAgent()throws Exception{ + Mapparams = new HashMap<>(); + params.put(Constants.CHAIN_ID,2); + //params.put("address","tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG"); + params.put("address","tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD"); + params.put("password", "nuls123456"); + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_stopAgent", params); + System.out.println(cmdResp.getResponseData()); + } + + @Test + public void getAgentInfo()throws Exception{ + Mapparams = new HashMap<>(); + params.put(Constants.CHAIN_ID,2); + // c5f2c0d00cbca36c39912f9332e91ec3098aedc3e47c26e2135a2057949da989 + params.put("agentHash","07dece0a400508d749a5e4e5f7d821c3e2836cb4de78c5083897dbe1f4d9caf9"); + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_getAgentInfo", params); + System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); + } + /** * 委托节点 * */ @@ -122,15 +170,6 @@ public void withdraw()throws Exception{ System.out.println(cmdResp.getResponseData()); } - @Test - public void getAgentInfo()throws Exception{ - Mapparams = new HashMap<>(); - params.put(Constants.CHAIN_ID,2); - params.put("agentHash","4dce090750b1900c1e741b961b32e75ce9f9d9c69997388ec73e9dd62cb8c835"); - Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_getAgentInfo", params); - System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); - } - /** * 流程 - 创建TOKEN, POCM, 添加节点，抵押，退出 */ @@ -485,7 +524,6 @@ public void transfer2Contract() throws Exception { /** * 调用视图方法 - 合约整体信息 */ - @View @Test public void getContractWholeInfo() throws Exception { String methodName = "wholeConsensusInfo"; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java index e2e6348293..d97894e27f 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java @@ -25,7 +25,6 @@ package io.nuls.contract.tx.randomseed; -import io.nuls.contract.sdk.annotation.View; import io.nuls.contract.tx.base.BaseQuery; import io.nuls.contract.util.Log; import io.nuls.core.parse.JSONUtils; @@ -42,7 +41,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import static io.nuls.contract.constant.ContractCmdConstant.CALL; import static io.nuls.contract.constant.ContractCmdConstant.CREATE; /** @@ -153,7 +151,6 @@ public void getRandomSeedListByHeight() throws Exception { /** * 调用视图方法 - 合约整体信息 */ - @View @Test public void getContractWholeInfo() throws Exception { Log.info("viewRandomSeedByCountAndAlg is {}", invokeView(contractAddress, "viewRandomSeedByCountAndAlg", 10, 5, "sha3")); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/BeanUtilTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/BeanUtilTest.java index 6ec49c7bef..00987f94a9 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/BeanUtilTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/BeanUtilTest.java @@ -23,8 +23,6 @@ */ package io.nuls.contract.util; -import com.alibaba.fastjson.JSONObject; -import io.nuls.core.basic.Result; import io.nuls.core.constant.ErrorCode; import io.nuls.core.parse.JSONUtils; import org.junit.Test; @@ -87,14 +85,14 @@ public static void setBean(Object src, String beanName, Object bean) { } } - @Test - public void test() throws IOException { - String json = "{\"jsonrpc\":\"2.0\",\"id\":2103470749,\"result\":{\"address\":\"tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD\",\"alias\":null,\"type\":1,\"txCount\":27,\"totalOut\":70800000,\"totalIn\":1000000060219650,\"consensusLock\":0,\"timeLock\":0,\"balance\":999999989419650,\"totalBalance\":999999989419650,\"totalReward\":1000000060219650,\"tokens\":[\"tNULSeBaNCHAhqG84z2kdeHx6AuFH6Zk6TmDDG,POCMTEST\"]}}"; - RpcResult rpcResult = JSONObject.parseObject(json, RpcResult.class); - System.out.println(rpcResult); - RpcResult rpcResult1 = JSONUtils.json2pojo(json, RpcResult.class); - System.out.println(rpcResult1); - } +// @Test +// public void test() throws IOException { +// String json = "{\"jsonrpc\":\"2.0\",\"id\":2103470749,\"result\":{\"address\":\"tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD\",\"alias\":null,\"type\":1,\"txCount\":27,\"totalOut\":70800000,\"totalIn\":1000000060219650,\"consensusLock\":0,\"timeLock\":0,\"balance\":999999989419650,\"totalBalance\":999999989419650,\"totalReward\":1000000060219650,\"tokens\":[\"tNULSeBaNCHAhqG84z2kdeHx6AuFH6Zk6TmDDG,POCMTEST\"]}}"; +// RpcResult rpcResult = JSONObject.parseObject(json, RpcResult.class); +// System.out.println(rpcResult); +// RpcResult rpcResult1 = JSONUtils.json2pojo(json, RpcResult.class); +// System.out.println(rpcResult1); +// } class RpcResult { diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java index 80c3123ccc..de5ee4269c 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java @@ -1,12 +1,13 @@ package io.nuls.contract.util; -import com.alibaba.fastjson.JSONObject; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.model.bo.ContractResult; +import io.nuls.core.parse.JSONUtils; import io.nuls.core.rockdb.service.RocksDBService; import org.junit.Before; import org.junit.Test; +import java.io.IOException; import java.lang.reflect.Field; import java.nio.charset.Charset; @@ -35,7 +36,13 @@ public void setUp() throws Exception { @Test public void newInstance() { String json = "{\"acceptDirectTransfer\":false,\"balance\":0,\"contractAddress\":\"OTACBl9m97GO964IHLFSyjPj9EtnTd4=\",\"error\":false,\"events\":[\"{\\\"contractAddress\\\":\\\"5MR_3PyDN5hzZVEw8Jv21TNFZ5P5fNuvETj\\\",\\\"blockNumber\\\":29,\\\"event\\\":\\\"TransferEvent\\\",\\\"payload\\\":{\\\"from\\\":null,\\\"to\\\":\\\"5MR_2CjZkQsN7EnEPcaLgNrMrp6wpPGN6xo\\\",\\\"value\\\":\\\"1000000000000\\\"}}\"],\"gasUsed\":15794,\"hash\":\"0020342527f7320dedcb47c1efd7a86d0573d0669cd77077aa25879f74e79ff74106\",\"mergedTransferList\":[],\"nonce\":1,\"nrc20\":true,\"price\":25,\"remark\":\"create\",\"revert\":false,\"sender\":\"OTAB7k8OT0MWMF0uePRSkJQlgkRNnA8=\",\"stateRoot\":\"nIeL/Gtr7oZPMGlI6UdeM5q12F8XSKmn5yYCofXfHbQ=\",\"success\":true,\"terminated\":false,\"tokenDecimals\":2,\"tokenName\":\"KQB\",\"tokenSymbol\":\"KongQiBi\",\"tokenTotalSupply\":1000000000000,\"transfers\":[],\"txTime\":1553099238363,\"value\":0}"; - ContractResult result = JSONObject.parseObject(json, ContractResult.class); + ContractResult result = null; + try { + result = JSONUtils.json2pojo(json, ContractResult.class); + } catch (IOException e) { + e.printStackTrace(); + return; + } System.out.println(result.toString()); } diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/LedgerTestUtil.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/LedgerTestUtil.java new file mode 100644 index 0000000000..a855962b60 --- /dev/null +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/LedgerTestUtil.java @@ -0,0 +1,52 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.util; + +import io.nuls.contract.model.bo.Chain; +import io.nuls.contract.model.bo.ContractBalance; +import io.nuls.contract.rpc.call.LedgerCall; +import io.nuls.core.exception.NulsException; + +import java.math.BigInteger; +import java.util.Map; + +/** + * @author: PierreLuo + * @date: 2022/6/23 + */ +public class LedgerTestUtil { + public static ContractBalance getUnConfirmedBalanceAndNonce(Chain chain, int assetChainId, int assetId, String address) { + try { + Map balance = LedgerCall.getBalanceAndNonce(chain, assetChainId, assetId, address); + ContractBalance contractBalance = ContractBalance.newInstance(); + contractBalance.setBalance(new BigInteger(balance.get("available").toString())); + contractBalance.setFreeze(new BigInteger(balance.get("freeze").toString())); + contractBalance.setNonce((String) balance.get("nonce")); + return contractBalance; + } catch (NulsException e) { + Log.error(e); + return ContractBalance.newInstance(); + } + } +} diff --git a/module/nuls-transaction/module.ncf b/module/nuls-transaction/module.ncf index 68b463b18c..e10cd8e77e 100644 --- a/module/nuls-transaction/module.ncf +++ b/module/nuls-transaction/module.ncf @@ -11,4 +11,3 @@ Managed=1 [transaction] moduleDynamicDependent=protocol-update,smart-contract - diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java index 9e7350bf2c..8eb244b847 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java @@ -31,6 +31,7 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; +import io.nuls.core.model.StringUtils; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; @@ -42,12 +43,15 @@ import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.transaction.constant.TxConfig; import io.nuls.transaction.constant.TxConstant; +import io.nuls.transaction.constant.TxContext; import io.nuls.transaction.constant.TxDBConstant; import io.nuls.transaction.manager.ChainManager; import io.nuls.transaction.model.bo.Chain; import io.nuls.transaction.utils.DBUtil; import io.nuls.transaction.utils.TxUtil; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Set; import static io.nuls.transaction.utils.LoggerUtil.LOG; @@ -83,6 +87,7 @@ public void init() { initSys(); //初始化数据库配置文件 initDB(); + initTransactionContext(); chainManager.initChain(); TxUtil.blackHolePublicKey = HexUtil.decode(txConfig.getBlackHolePublicKey()); ModuleHelper.init(this); @@ -197,5 +202,15 @@ public void initDB() { } } - + private void initTransactionContext(){ + String accountBlockManagerPublicKeys = txConfig.getAccountBlockManagerPublicKeys(); + if (StringUtils.isNotBlank(accountBlockManagerPublicKeys)) { + String[] split = accountBlockManagerPublicKeys.split(","); + for (String pubkey : split) { + TxContext.ACCOUNT_BLOCK_MANAGER_ADDRESS_SET.add(AddressTool.getAddressString(HexUtil.decode(pubkey.trim()), txConfig.getChainId())); + } + int size = TxContext.ACCOUNT_BLOCK_MANAGER_ADDRESS_SET.size(); + TxContext.ACCOUNT_BLOCK_MIN_SIGN_COUNT = BigDecimal.valueOf(size).multiply(BigDecimal.valueOf(6)).divide(BigDecimal.TEN, 0, RoundingMode.UP).intValue(); + } + } } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java index 30ed957146..6884d78a96 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java @@ -34,6 +34,25 @@ public class TxConfig extends ConfigBean implements ModuleConfig { private long unconfirmedTxExpire; private String blackHolePublicKey; + private String blackListPath; + private String accountBlockManagerPublicKeys; + + public String getAccountBlockManagerPublicKeys() { + return accountBlockManagerPublicKeys; + } + + public void setAccountBlockManagerPublicKeys(String accountBlockManagerPublicKeys) { + this.accountBlockManagerPublicKeys = accountBlockManagerPublicKeys; + } + + public String getBlackListPath() { + return blackListPath; + } + + public void setBlackListPath(String blackListPath) { + this.blackListPath = blackListPath; + } + public String getBlackHolePublicKey() { return blackHolePublicKey; } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxContext.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxContext.java index c6604b8f28..9747ee51bd 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxContext.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxContext.java @@ -23,6 +23,9 @@ */ package io.nuls.transaction.constant; +import java.util.HashSet; +import java.util.Set; + /** * @author: PierreLuo * @date: 2019-12-04 @@ -31,4 +34,12 @@ public class TxContext { public static short UPDATE_VERSION_V250 = 5; public static short UPDATE_VERSION_CONTRACT_ASSET = 8; + + public static short UPDATE_VERSION_ACCOUNT_BLOCK = 11; + + public static short UPDATE_VERSION_ACCOUNT_BLOCK_UPGRADE = 12; + + public static Set ACCOUNT_BLOCK_MANAGER_ADDRESS_SET = new HashSet<>(); + // 最小签名数 + public static int ACCOUNT_BLOCK_MIN_SIGN_COUNT = 0; } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxErrorCode.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxErrorCode.java index beb0ec9a3a..4b83813807 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxErrorCode.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxErrorCode.java @@ -58,6 +58,7 @@ public interface TxErrorCode extends CommonCodeConstanst { ErrorCode SYS_CONTRACT_TX_NON_CIRCULATING = ErrorCode.init(ModuleE.TX.getPrefix() + "_0041"); ErrorCode CONTAINS_MULTIPLE_UNIQUE_TXS = ErrorCode.init(ModuleE.TX.getPrefix() + "_0042"); ErrorCode EXIST_GAS_RETURN_WITHOUT_SC_RETURN = ErrorCode.init(ModuleE.TX.getPrefix() + "_0043"); + ErrorCode BLOCK_ADDRESS = ErrorCode.init(ModuleE.TX.getPrefix() + "_0044"); } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java new file mode 100644 index 0000000000..ae07ec6f5d --- /dev/null +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java @@ -0,0 +1,68 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.transaction.model.dto; + +/** + * @author: PierreLuo + * @date: 2022/1/24 + */ +public class AccountBlockDTO { + + private byte[] address; + private int[] types; + private String[] contracts; + private byte[] extend; + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public int[] getTypes() { + return types; + } + + public void setTypes(int[] types) { + this.types = types; + } + + public String[] getContracts() { + return contracts; + } + + public void setContracts(String[] contracts) { + this.contracts = contracts; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java new file mode 100644 index 0000000000..69b1c3d7d4 --- /dev/null +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java @@ -0,0 +1,145 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.transaction.model.po; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +public class AccountBlockExtendPO extends BaseNulsData { + + private byte[] address; + + private int[] types; + + private String[] contracts; + + private byte[] extend; + + public AccountBlockExtendPO() { + } + + @Override + public int size() { + int size = 0; + size += Address.ADDRESS_LENGTH; + // length + size += SerializeUtils.sizeOfUint16(); + if (types != null) { + size += SerializeUtils.sizeOfUint16() * types.length; + } + size += SerializeUtils.sizeOfUint16(); + if (contracts != null) { + for (String contract : contracts) { + size += SerializeUtils.sizeOfString(contract); + } + } + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(address); + if (types == null) { + stream.writeUint16(0); + } else { + stream.writeUint16(types.length); + for (int type : types) { + stream.writeUint16(type); + } + } + if (contracts == null) { + stream.writeUint16(0); + } else { + stream.writeUint16(contracts.length); + for (String address : contracts) { + stream.writeString(address); + } + } + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.address = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + int length0 = byteBuffer.readUint16(); + int[] _types = new int[length0]; + for (int i = 0; i < length0; i++) { + _types[i] = byteBuffer.readUint16(); + } + int length = byteBuffer.readUint16(); + String[] _addresses = new String[length]; + for (int i = 0; i < length; i++) { + _addresses[i] = byteBuffer.readString(); + } + this.types = _types; + this.contracts = _addresses; + this.extend = byteBuffer.readByLengthByte(); + } + + public int[] getTypes() { + return types; + } + + public void setTypes(int[] types) { + this.types = types; + } + + public String[] getContracts() { + return contracts; + } + + public void setContracts(String[] contracts) { + this.contracts = contracts; + } + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java new file mode 100644 index 0000000000..30f06cecab --- /dev/null +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java @@ -0,0 +1,86 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.transaction.model.po; + + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.basic.NulsOutputStreamBuffer; +import io.nuls.base.data.Address; +import io.nuls.base.data.BaseNulsData; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.SerializeUtils; + +import java.io.IOException; + +/** + * @author: PierreLuo + * @date: 2022/1/18 + */ +public class AccountBlockPO extends BaseNulsData { + + private byte[] address; + + private byte[] extend; + + public AccountBlockPO() { + } + + @Override + public int size() { + int size = 0; + size += Address.ADDRESS_LENGTH; + size += SerializeUtils.sizeOfBytes(extend); + return size; + } + + @Override + protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { + stream.write(address); + stream.writeBytesWithLength(extend); + } + + @Override + public void parse(NulsByteBuffer byteBuffer) throws NulsException { + this.address = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + this.extend = byteBuffer.readByLengthByte(); + } + + public byte[] getAddress() { + return address; + } + + public void setAddress(byte[] address) { + this.address = address; + } + + public byte[] getExtend() { + return extend; + } + + public void setExtend(byte[] extend) { + this.extend = extend; + } +} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java index 6f36b0c749..cc2fa6fa44 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java @@ -2,12 +2,17 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.data.MultiSigAccount; +import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; +import io.nuls.core.model.StringUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.constant.TxErrorCode; +import io.nuls.transaction.model.dto.AccountBlockDTO; +import io.nuls.transaction.model.po.AccountBlockExtendPO; +import io.nuls.transaction.model.po.AccountBlockPO; import io.nuls.transaction.utils.TxUtil; import java.util.HashMap; @@ -45,4 +50,51 @@ public static MultiSigAccount getMultiSigAccount(byte[] multiSignAddress) throws } } + public static boolean isBlockAccount(int chainId, String address) { + try { + if (StringUtils.isBlank(address)) { + return false; + } + Map params = new HashMap<>(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("address", address); + Map resultMap = (Map) TransactionCall.requestAndResponse(ModuleE.AC.abbr, "ac_isBlockAccount", params); + boolean isBlock = (boolean) resultMap.get("value"); + return isBlock; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + public static AccountBlockDTO getBlockAccount(int chainId, String address) { + try { + if (StringUtils.isBlank(address)) { + return null; + } + Map params = new HashMap<>(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("address", address); + Map resultMap = (Map) TransactionCall.requestAndResponse(ModuleE.AC.abbr, "ac_getBlockAccountBytes", params); + String hex = (String) resultMap.get("value"); + if (StringUtils.isBlank(hex)) { + return null; + } + AccountBlockPO po = new AccountBlockPO(); + po.parse(HexUtil.decode(hex), 0); + AccountBlockDTO dto = new AccountBlockDTO(); + dto.setAddress(po.getAddress()); + if (po.getExtend() != null) { + AccountBlockExtendPO extendPO = new AccountBlockExtendPO(); + extendPO.parse(po.getExtend(), 0); + dto.setTypes(extendPO.getTypes()); + dto.setContracts(extendPO.getContracts()); + dto.setExtend(extendPO.getExtend()); + } + return dto; + } catch (Exception e) { + Log.error(e); + return null; + } + } } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java index f8f6f09111..f10d0bc36b 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java @@ -59,6 +59,7 @@ import io.nuls.transaction.constant.TxErrorCode; import io.nuls.transaction.manager.TxManager; import io.nuls.transaction.model.bo.*; +import io.nuls.transaction.model.dto.AccountBlockDTO; import io.nuls.transaction.model.dto.ModuleTxRegisterDTO; import io.nuls.transaction.model.po.TransactionConfirmedPO; import io.nuls.transaction.model.po.TransactionNetPO; @@ -305,7 +306,12 @@ public void baseValidateTx(Chain chain, Transaction tx, TxRegister txRegister) t throw new NulsException(TxErrorCode.TX_SIZE_TOO_LARGE); } //验证签名 - validateTxSignature(tx, txRegister, chain); + if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_ACCOUNT_BLOCK_UPGRADE) { + validateTxSignatureProtocol12(tx, txRegister, chain); + } else { + validateTxSignature(tx, txRegister, chain); + } + //如果有coinData, 则进行验证,有一些交易(黄牌)没有coinData数据 int txType = tx.getType(); if (txType == TxType.YELLOW_PUNISH @@ -386,7 +392,91 @@ private void validateTxSignature(Transaction tx, TxRegister txRegister, Chain ch } } for (CoinFrom coinFrom : coinData.getFrom()) { - if (tx.getType() == TxType.STOP_AGENT) { + if (tx.getType() == TxType.STOP_AGENT || tx.getType() == TxType.DELAY_STOP_AGENT) { + //停止节点from中第一笔为签名地址, 只验证from中第一个 + break; + } + if (tx.isMultiSignTx()) { + if (!Arrays.equals(coinFrom.getAddress(), multiSignAddress)) { + throw new NulsException(TxErrorCode.SIGNATURE_ERROR); + } + } else if (!addressSet.contains(AddressTool.getStringAddressByBytes(coinFrom.getAddress()))) { + throw new NulsException(TxErrorCode.SIGN_ADDRESS_NOT_MATCH_COINFROM); + } + } + if (!SignatureUtil.validateTransactionSignture(chainId, tx)) { + throw new NulsException(TxErrorCode.SIGNATURE_ERROR); + } + } + + private void validateTxSignatureProtocol12(Transaction tx, TxRegister txRegister, Chain chain) throws NulsException { + //只需要验证,需要验证签名的交易(一些系统交易不用签名) + if (!txRegister.getVerifySignature()) { + //注册时不需要验证签名的交易(一些系统交易) + return; + } + CoinData coinData = TxUtil.getCoinData(tx); + if (null == coinData || null == coinData.getFrom() || coinData.getFrom().size() <= 0) { + throw new NulsException(TxErrorCode.COINDATA_NOT_FOUND); + } + if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (tx.getType() != TxType.CROSS_CHAIN) { + // 跨链模块的非本链协议的跨链转账交易(单独处理). + return; + } + int fromChainId = AddressTool.getChainIdByAddress(coinData.getFrom().get(0).getAddress()); + // 跨链模块的非本链协议跨链交易(单独处理). + if (chain.getChainId() != fromChainId) { + return; + } + } + //获取交易签名者地址列表 + Set addressSet = SignatureUtil.getAddressFromTX(tx, chain.getChainId()); + if (addressSet == null) { + throw new NulsException(TxErrorCode.SIGNATURE_ERROR); + } + int chainId = chain.getChainId(); + byte[] multiSignAddress = null; + if (tx.isMultiSignTx()) { + /** + * 如果是多签交易, 则先从签名对象中取出多签地址原始创建者的公钥列表和最小签名数, + * 生成一个新的多签地址,来与交易from中的多签地址匹配，匹配不上这验证不通过. + */ + MultiSignTxSignature multiSignTxSignature = new MultiSignTxSignature(); + multiSignTxSignature.parse(new NulsByteBuffer(tx.getTransactionSignature())); + //验证签名者够不够最小签名数 + if (addressSet.size() < multiSignTxSignature.getM()) { + throw new NulsException(TxErrorCode.INSUFFICIENT_SIGNATURES); + } + //签名者是否是多签账户创建者之一 + for (String address : addressSet) { + boolean rs = false; + for (byte[] bytes : multiSignTxSignature.getPubKeyList()) { + String addr = AddressTool.getStringAddressByBytes(AddressTool.getAddress(bytes, chainId)); + if (address.equals(addr)) { + rs = true; + } + } + if (!rs) { + throw new NulsException(TxErrorCode.SIGN_ADDRESS_NOT_MATCH_COINFROM); + } + } + //生成一个多签地址 + List pubKeys = new ArrayList<>(); + for (byte[] pubkey : multiSignTxSignature.getPubKeyList()) { + pubKeys.add(HexUtil.encode(pubkey)); + } + try { + byte[] hash160 = SerializeUtils.sha256hash160(AddressTool.createMultiSigAccountOriginBytes(chainId, multiSignTxSignature.getM(), pubKeys)); + Address address = new Address(chainId, BaseConstant.P2SH_ADDRESS_TYPE, hash160); + multiSignAddress = address.getAddressBytes(); + } catch (Exception e) { + chain.getLogger().error(e); + throw new NulsException(TxErrorCode.SIGNATURE_ERROR); + } + } + for (CoinFrom coinFrom : coinData.getFrom()) { + if (tx.getType() == TxType.STOP_AGENT || tx.getType() == TxType.DELAY_STOP_AGENT) { //停止节点from中第一笔为签名地址, 只验证from中第一个 break; } @@ -398,6 +488,80 @@ private void validateTxSignature(Transaction tx, TxRegister txRegister, Chain ch throw new NulsException(TxErrorCode.SIGN_ADDRESS_NOT_MATCH_COINFROM); } } + do { + int txType = tx.getType(); + // 质押和退出质押不验证锁定地址 + if (txType == TxType.DEPOSIT || txType == TxType.CANCEL_DEPOSIT || txType == TxType.STOP_AGENT || txType == TxType.DELAY_STOP_AGENT) { + break; + } + boolean needAccountManagerSign = false; + for (CoinFrom coinFrom : coinData.getFrom()) { + byte[] fromAddress = coinFrom.getAddress(); + AccountBlockDTO dto = AccountCall.getBlockAccount(chainId, AddressTool.getStringAddressByBytes(fromAddress)); + if (dto == null) { + continue; + } + int[] types = dto.getTypes(); + if (types == null) { + // 完全锁定账户，需要验证签名 + needAccountManagerSign = true; + break; + } else { + // 交易类型白名单 + boolean whiteType = false; + for (int type : types) { + if (txType == type) { + whiteType = true; + break; + } + } + if (!whiteType) { + // 不在交易类型白名单中，需要验证签名 + needAccountManagerSign = true; + break; + } + // 验证合约地址白名单 + if (txType == TxType.CALL_CONTRACT) { + if (dto.getContracts() == null || dto.getContracts().length == 0) { + // 不在合约地址白名单中，需要验证签名 + needAccountManagerSign = true; + break; + } + String[] contracts = dto.getContracts(); + NulsByteBuffer byteBuffer = new NulsByteBuffer(tx.getTxData()); + byteBuffer.readBytes(Address.ADDRESS_LENGTH); + byte[] contractAddressBytes = byteBuffer.readBytes(Address.ADDRESS_LENGTH); + String contractAddress = AddressTool.getStringAddressByBytes(contractAddressBytes); + // 合约地址白名单 + boolean whiteContract = false; + for (String contract : contracts) { + if (contractAddress.equals(contract)) { + whiteContract = true; + break; + } + } + if (!whiteContract) { + // 不在合约地址白名单中，需要验证签名 + needAccountManagerSign = true; + break; + } + } + } + } + if (needAccountManagerSign) { + // 五分之三签名，从配置文件中读取锁定账户管理员公钥，算出地址，在`addressSet`中匹配，>=60% 即满足 + int count = 0; + for (String signedAddress : addressSet) { + if (TxContext.ACCOUNT_BLOCK_MANAGER_ADDRESS_SET.contains(signedAddress)) { + count++; + } + } + if (count < TxContext.ACCOUNT_BLOCK_MIN_SIGN_COUNT) { + throw new NulsException(TxErrorCode.BLOCK_ADDRESS, "address is blockAddress Exception"); + } + } + } while (false); + if (!SignatureUtil.validateTransactionSignture(chainId, tx)) { throw new NulsException(TxErrorCode.SIGNATURE_ERROR); } @@ -422,6 +586,9 @@ private void validateCoinFromBase(Chain chain, TxRegister txRegister, List packingT rs.put("hasTxbackPackablePool", hasTxbackPackablePool); return rs; } + } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java index 066f536086..4590fe1fc0 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java @@ -40,6 +40,7 @@ import io.nuls.transaction.manager.TxManager; import io.nuls.transaction.model.bo.Chain; import io.nuls.transaction.model.bo.TxRegister; +import io.nuls.transaction.rpc.call.AccountCall; import java.io.UnsupportedEncodingException; import java.util.*; @@ -447,4 +448,17 @@ public static boolean isBlackHoleAddress(int chainId, byte[] address) { // end code by pierre return AddressTool.BLOCK_HOLE_ADDRESS_SET.contains(contractAddress); } + + public static boolean isBlockAddress(int chainId, byte[] address) { + // add by pierre at 2022-01-18 协议升级锁定地址 + if(address == null) { + return false; + } + if (ProtocolGroupManager.getCurrentVersion(chainId) < TxContext.UPDATE_VERSION_ACCOUNT_BLOCK) { + return false; + } + String addressStr = AddressTool.getStringAddressByBytes(address); + return AccountCall.isBlockAccount(chainId, addressStr); + // end code by pierre + } } diff --git a/module/nuls-transaction/src/main/resources/languages/en.properties b/module/nuls-transaction/src/main/resources/languages/en.properties index 77985d622a..f3e08bfbd9 100644 --- a/module/nuls-transaction/src/main/resources/languages/en.properties +++ b/module/nuls-transaction/src/main/resources/languages/en.properties @@ -41,3 +41,4 @@ tx_0040=System transactions cannot circulated directly through the network tx_0041=System contract transactions cannot circulated directly through the network tx_0042=Block Contains multiple unique transactions tx_0043=Exist gas transactions without smart contract return transactions +tx_0044=Block address diff --git a/module/nuls-transaction/src/main/resources/module.json b/module/nuls-transaction/src/main/resources/module.json index 91024c9000..ade85e1b12 100644 --- a/module/nuls-transaction/src/main/resources/module.json +++ b/module/nuls-transaction/src/main/resources/module.json @@ -10,5 +10,6 @@ "moduleVerifyPercent":30, "packageRpcReserveTime":100, "txUnverifiedQueueSize":100000, - "orphanTtl":600 + "orphanTtl":600, + "accountBlockManagerPublicKeys": "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad,029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020,02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb,020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8,02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195" } \ No newline at end of file diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java b/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java index 93cba97523..0080971acc 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java +++ b/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java @@ -20,43 +20,135 @@ package io.nuls.transaction.tx; -import io.nuls.base.basic.AddressTool; -import io.nuls.base.signture.P2PHKSignature; -import io.nuls.base.signture.TransactionSignature; -import io.nuls.core.crypto.ECKey; -import io.nuls.core.crypto.HexUtil; -import io.nuls.core.exception.NulsException; +import java.util.ArrayList; +import java.util.List; /** * @author Niels */ public class TxSignTest { - public static void main(String[] args) throws NulsException { - String txSign = "2102b0a6f555e548a43fb7ddb6560b7edf099b1a649be66b3cebfb3cfc3c589f502a473045022100ae6ab360460d937168a53f176a0ab2aa207d11ff4dc0c45f250f323ca7509d9a022005e2b00839860648078125348f42a86857d71bb7673c94516381bde8e05b38cf2102fc324c8e18dc0ee816bc186b3d4240ca856b80dc5312f96b207b8b84339f185a473045022100ae6ab360460d937168a53f176a0ab2aa207d11ff4dc0c45f250f323ca7509d9a022005e2b00839860648078125348f42a86857d71bb7673c94516381bde8e05b38cf"; - String txHash = "568533e38c472f9e0740f318038b49ebe6b59817ce374c6816bf645744beb6ed"; - - TransactionSignature sign = new TransactionSignature(); - sign.parse(HexUtil.decode(txSign),0); - byte[] pub = sign.getP2PHKSignatures().get(0).getPublicKey(); - System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); - ECKey ecKey = ECKey.fromPublicOnly(pub); - boolean result = ecKey.verify(HexUtil.decode(txHash),sign.getP2PHKSignatures().get(0).getSignData().getSignBytes()); - System.out.println(result); - - pub = sign.getP2PHKSignatures().get(1).getPublicKey(); - System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); - ecKey = ECKey.fromPublicOnly(pub); - result = ecKey.verify(HexUtil.decode(txHash),sign.getP2PHKSignatures().get(1).getSignData().getSignBytes()); - System.out.println(result); - - - for (P2PHKSignature signature : sign.getP2PHKSignatures()) { - if (!ECKey.verify(HexUtil.decode(txHash), signature.getSignData().getSignBytes(), signature.getPublicKey())) { - System.out.println("bbbbbbbbbb"); - throw new NulsException(new Exception("Transaction signature error !")); - } - System.out.println("aaaaaaaaa"); - } + public static void main(String[] args) throws Exception { + //String txSign = "2102c1ba01932d6451c6d64966151fef6ab1aa40f47b855d9576b7dc0412adffdbc2473045022100855d069fbb65f9dd3873fe3abba51246da671b3754ef4de0e55dfc0d176b051102203072e774ab3a66ddf3f140494d1d3f4cff19734aaca94ce8fba7070e879f9d15"; + //String txHash = "8ddbb4a504532defc35f8db6feb63fd205a3a4cde952f74a5ab2537c024ba95d"; + + //TransactionSignature sign = new TransactionSignature(); + //sign.parse(HexUtil.decode(txSign),0); + //byte[] pub = sign.getP2PHKSignatures().get(0).getPublicKey(); + //System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); + //ECKey ecKey = ECKey.fromPublicOnly(pub); + //boolean result = ecKey.verify(HexUtil.decode(txHash),sign.getP2PHKSignatures().get(0).getSignData().getSignBytes()); + //System.out.println(result); + + //pub = sign.getP2PHKSignatures().get(1).getPublicKey(); + //System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); + //ecKey = ECKey.fromPublicOnly(pub); + // result = ecKey.verify(HexUtil.decode(txHash),sign.getP2PHKSignatures().get(1).getSignData().getSignBytes()); + //System.out.println(result); + + + //for (P2PHKSignature signature : sign.getP2PHKSignatures()) { + // byte[] pub = signature.getPublicKey(); + // System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); + // ECKey ecKey = ECKey.fromPublicOnly(pub); + // boolean result = ecKey.verify(HexUtil.decode(txHash), signature.getSignData().getSignBytes()); + // System.out.println(result); + // //if (!ECKey.verify(HexUtil.decode(txHash), signature.getSignData().getSignBytes(), signature.getPublicKey())) { + // // System.out.println("bbbbbbbbbb"); + // // throw new NulsException(new Exception("Transaction signature error !")); + // //} + // System.out.println("aaaaaaaaa"); + //} + + List list = new ArrayList<>(); + list.add("NULSd6HggxbVpms48DxhAu6X8MdkrMCZLTrDq 265687 4e84a5a3398670920dd7b79e6d3854f88495aa34d22d720346a59dd9589dfdfa"); + list.add("NULSd6HggjUx7Yka54WXJVc82Di62gJ8XzZmV 140123 5038a9820e9560087f07e169717d00de2606b86d69b7474b1781fd97ee81ab4d"); + list.add("NULSd6HgiYsM5S3b1K79R8o7ecoLjQNvfPRus 306132 8dd58cec6636a46d6b45e6c73795c87490efd3c17aa7d40a6c9b185c623a003f"); + list.add("NULSd6HgiQrKehxN6kL9qeNWVdZqhqLfkjHCk 30061.8 b06cc1b6f0af0f44c5a67fd9de4ebf5fe7a0ba80a3536636789662f40257dac7"); + list.add("NULSd6HgakaunpRHdivWPqKFZrYLPgkPBtNtr 258480 99612be08804132c23c6116335811116efd12738eacc17c8af2b707d22cd817e"); + list.add("NULSd6Hgbcn7gdGuapjgM8QsSTBtqsgKZ7Y8v 73758 ac027273c5df327ce23e78bed320fae845b02328e20d5c57252cfa16fb15c2b3"); + list.add("NULSd6HgYFbxkBQY4g5KALyZYnViHC69cYBDJ 365615 8ddbb4a504532defc35f8db6feb63fd205a3a4cde952f74a5ab2537c024ba95d"); + list.add("NULSd6HgYFbxkBQY4g5KALyZYnViHC69cYBDJ 6107 a7341611bc17338709d5587155cc590818b27fd59edad83644d56867a89d68f4"); + list.add("NULSd6HgdsnbbU9UL9vuxszcPqdLE7ADUDwKR 15654 0b5e52c2f4d7772279a00ffb43101cb332c10d6d8d8be4662e744c7eebe1db4f"); + list.add("NULSd6HgYYcsTcjPLphgzGoJ6bWqRjsE6oEbk 105444 8c4215091a11fc5ea4d97a12a982525ae3a7f1cf7801c44faf8a51ba2db9e26c"); + list.add("NULSd6HgbJZ4n4roadePzyf8Zx2YkD8RcoYuc 215272 ba9b2cc987b888f95340e39dcb1942a71cf8dc1be052dea6f0b2199e35821d01"); + list.add("NULSd6HgbJZ4n4roadePzyf8Zx2YkD8RcoYuc 10000 12192e6ad13599b027ac07b0e51eeae948ee193e5d4c0ce75050c205f1f685a9"); + list.add("NULSd6HgXDFjzhjNANSNCH6sXvjP4d1Zu5vrV 15870 3108d428751d0c4ea70ea7b6218b08f78eb28b1b27d897e7623642778353e6df"); + list.add("NULSd6HgbBDcE6chnSfvgPpT3YBy4tHA2v4By 21811 ebc8117c88f859ce271685533e36638d89106457ef53959cddcf34945e95e16c"); + list.add("NULSd6HgYpRtzGgRHy32ayZXZjVx5RuUNN7PD 10299 83359646d1a4bf60685f08d1900c9e5f2ae1c9cf25459fe87d839b2a3cad06af"); + list.add("NULSd6HgUXrV1fkbKwszFhSjhckZbW25TQeWj 12601 0f50082a8cee0e42d547f8c9c346898e3317050364c867e2a51c2c8d305b1904"); + list.add("NULSd6HgUxiPz3EMdZSuMHZf1caN8dVYCxRJx 3885 690661d1d5fc58bfbbdfa90f5874382b0f12ac5aa5382639bb956c14961236b6"); + list.add("NULSd6HgdwgigpqWvDBjt5ptPeioGsp49fTbp 2775 ddbcd47c767df7f89fa42412e9bf9105d498b452e6076852795b1590654473b5"); + //for (String aaa : list) { + // String[] aaas = aaa.split("\\s+"); + // String address = aaas[0].trim(); + // System.out.println(Arrays.toString(aaas)); + // String txInfo = HttpClientUtil.get(String.format("http://192.168.1.125:8004/api/tx/%s", aaas[2].trim())); + // Map objectMap = JSONUtils.json2map(txInfo); + // Map map = (Map) objectMap.get("data"); + // String txHash = map.get("hash").toString(); + // String txSign = map.get("transactionSignature").toString(); + // System.out.println(txHash); + // System.out.println(txSign); + // TransactionSignature sign = new TransactionSignature(); + // sign.parse(HexUtil.decode(txSign),0); + // //byte[] pub = sign.getP2PHKSignatures().get(0).getPublicKey(); + // //System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); + // //ECKey ecKey = ECKey.fromPublicOnly(pub); + // //boolean result = ecKey.verify(HexUtil.decode(txHash),sign.getP2PHKSignatures().get(0).getSignData().getSignBytes()); + // //System.out.println(result); + // + // //pub = sign.getP2PHKSignatures().get(1).getPublicKey(); + // //System.out.println(AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub,1))); + // //ecKey = ECKey.fromPublicOnly(pub); + // // result = ecKey.verify(HexUtil.decode(txHash),sign.getP2PHKSignatures().get(1).getSignData().getSignBytes()); + // //System.out.println(result); + // + // + // for (P2PHKSignature signature : sign.getP2PHKSignatures()) { + // byte[] pub = signature.getPublicKey(); + // String genAddress = AddressTool.getStringAddressByBytes(AddressTool.getAddress(pub, 1)); + // System.out.println(genAddress); + // boolean invalid = !address.equals(genAddress); + // if (invalid) { + // System.err.println("地址不一致"); + // } + // ECKey ecKey = ECKey.fromPublicOnly(pub); + // boolean result = ecKey.verify(HexUtil.decode(txHash), signature.getSignData().getSignBytes()); + // if (!result) { + // System.err.println("验证失败"); + // } + // System.out.println(result); + // //if (!ECKey.verify(HexUtil.decode(txHash), signature.getSignData().getSignBytes(), signature.getPublicKey())) { + // // System.out.println("bbbbbbbbbb"); + // // throw new NulsException(new Exception("Transaction signature error !")); + // //} + // System.out.println("aaaaaaaaa"); + // } + // System.out.println("---------------------------------------"); + //} + + + } + /* + list.add("NULSd6HggxbVpms48DxhAu6X8MdkrMCZLTrDq 265687 4e84a5a3398670920dd7b79e6d3854f88495aa34d22d720346a59dd9589dfdfa"); + list.add("NULSd6HggjUx7Yka54WXJVc82Di62gJ8XzZmV 140123 5038a9820e9560087f07e169717d00de2606b86d69b7474b1781fd97ee81ab4d"); + list.add("NULSd6HgiYsM5S3b1K79R8o7ecoLjQNvfPRus 306132 8dd58cec6636a46d6b45e6c73795c87490efd3c17aa7d40a6c9b185c623a003f"); + list.add("NULSd6HgiQrKehxN6kL9qeNWVdZqhqLfkjHCk 30061.8 b06cc1b6f0af0f44c5a67fd9de4ebf5fe7a0ba80a3536636789662f40257dac7"); + list.add("NULSd6HgakaunpRHdivWPqKFZrYLPgkPBtNtr 258480 99612be08804132c23c6116335811116efd12738eacc17c8af2b707d22cd817e"); + list.add("NULSd6Hgbcn7gdGuapjgM8QsSTBtqsgKZ7Y8v 73758 ac027273c5df327ce23e78bed320fae845b02328e20d5c57252cfa16fb15c2b3"); + list.add("NULSd6HgYFbxkBQY4g5KALyZYnViHC69cYBDJ 365615 8ddbb4a504532defc35f8db6feb63fd205a3a4cde952f74a5ab2537c024ba95d"); + list.add("NULSd6HgYFbxkBQY4g5KALyZYnViHC69cYBDJ 6107 a7341611bc17338709d5587155cc590818b27fd59edad83644d56867a89d68f4"); + list.add("NULSd6HgdsnbbU9UL9vuxszcPqdLE7ADUDwKR 15654 0b5e52c2f4d7772279a00ffb43101cb332c10d6d8d8be4662e744c7eebe1db4f"); + list.add("NULSd6HgYYcsTcjPLphgzGoJ6bWqRjsE6oEbk 105444 8c4215091a11fc5ea4d97a12a982525ae3a7f1cf7801c44faf8a51ba2db9e26c"); + list.add("NULSd6HgbJZ4n4roadePzyf8Zx2YkD8RcoYuc 215272 ba9b2cc987b888f95340e39dcb1942a71cf8dc1be052dea6f0b2199e35821d01"); + list.add("NULSd6HgbJZ4n4roadePzyf8Zx2YkD8RcoYuc 10000 12192e6ad13599b027ac07b0e51eeae948ee193e5d4c0ce75050c205f1f685a9"); + list.add("NULSd6HgXDFjzhjNANSNCH6sXvjP4d1Zu5vrV 15870 3108d428751d0c4ea70ea7b6218b08f78eb28b1b27d897e7623642778353e6df"); + list.add("NULSd6HgbBDcE6chnSfvgPpT3YBy4tHA2v4By 21811 ebc8117c88f859ce271685533e36638d89106457ef53959cddcf34945e95e16c"); + list.add("NULSd6HgYpRtzGgRHy32ayZXZjVx5RuUNN7PD 10299 83359646d1a4bf60685f08d1900c9e5f2ae1c9cf25459fe87d839b2a3cad06af"); + list.add("NULSd6HgUXrV1fkbKwszFhSjhckZbW25TQeWj 12601 0f50082a8cee0e42d547f8c9c346898e3317050364c867e2a51c2c8d305b1904"); + list.add("NULSd6HgUxiPz3EMdZSuMHZf1caN8dVYCxRJx 3885 690661d1d5fc58bfbbdfa90f5874382b0f12ac5aa5382639bb956c14961236b6"); + list.add("NULSd6HgdwgigpqWvDBjt5ptPeioGsp49fTbp 2775 ddbcd47c767df7f89fa42412e9bf9105d498b452e6076852795b1590654473b5"); + */ } diff --git a/package b/package index da25a905aa..677d58fce9 100755 --- a/package +++ b/package @@ -36,7 +36,7 @@ BUILD_NULSTAR="1" NULSTAR_FILE_NAME="nulstar_190909.tar.gz" #TARGET_OS=linux #NULSTAR download url -NULSTAR_URL="http://nuls-cn.oss-cn-hangzhou.aliyuncs.com/nulstar/" +NULSTAR_URL="https://nulscn.oss-cn-beijing.aliyuncs.com/nulstar/" #获取参数 #输出目录 NULS_WALLET_TAR_NAME="./NULS_Wallet" diff --git a/pom.xml b/pom.xml index 9987a2fe09..cbef15ed40 100644 --- a/pom.xml +++ b/pom.xml @@ -139,11 +139,11 @@ maven-releases - http://nexus.nuls.center/nexus/content/repositories/releases/ + http://nexus.nuls.io/repository/nuls-release/ maven-snapshots - http://nexus.nuls.center/nexus/content/repositories/snapshots/ + http://nexus.nuls.io/repository/nuls-snapshot/ diff --git a/test/nuls-test/src/main/java/io/nuls/test/Test.java b/test/nuls-test/src/main/java/io/nuls/test/Test.java index ae7ead10e1..baf34f7685 100644 --- a/test/nuls-test/src/main/java/io/nuls/test/Test.java +++ b/test/nuls-test/src/main/java/io/nuls/test/Test.java @@ -1,11 +1,15 @@ package io.nuls.test; import io.nuls.base.api.provider.account.facade.AccountInfo; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.crypto.Sha256Hash; import io.nuls.test.cases.SleepAdapter; import io.nuls.test.controller.RemoteCaseReq; import io.nuls.test.controller.RemoteResult; import io.nuls.test.utils.RestFulUtils; import io.nuls.core.parse.MapUtils; +import org.bouncycastle.jcajce.provider.digest.SHA256; +import org.bouncycastle.util.encoders.Hex; /** * @Author: zhoulijun @@ -15,12 +19,17 @@ public class Test { public static void main(String[] args) { - RemoteCaseReq req = new RemoteCaseReq(); - req.setCaseClass(SleepAdapter.$15SEC.class); - req.setParam("5MR_2CaLdKkCgdLAg9NYnppSRU9o5Lkx9wT"); - RestFulUtils.getInstance().setServerUri("http://192.168.1.115:9999/api"); - RemoteResult res = RestFulUtils.getInstance().post("/remote/call", MapUtils.beanToMap(req)); - System.out.println("res:{}" + res); +// RemoteCaseReq req = new RemoteCaseReq(); +// req.setCaseClass(SleepAdapter.$15SEC.class); +// req.setParam("5MR_2CaLdKkCgdLAg9NYnppSRU9o5Lkx9wT"); +// RestFulUtils.getInstance().setServerUri("http://192.168.1.115:9999/api"); +// RemoteResult res = RestFulUtils.getInstance().post("/remote/call", MapUtils.beanToMap(req)); +// System.out.println("res:{}" + res); + + String str = "ABCd"; + str = HexUtil.encode(Sha256Hash.hash(str.getBytes())); + System.out.println(str); + System.out.println("0cda48b9b56125648510ec9cd3ad8d3858ba73db9fe3c84e706585c6005d7bdc".length()); } } diff --git a/version b/version index 10c2c0c3d6..a103f3a143 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.10.0 +2.14.0-beta \ No newline at end of file From 80fdec535b856c659947fe01876c12c013d9c2f4 Mon Sep 17 00:00:00 2001 From: niels1286 Date: Mon, 15 May 2023 16:11:58 +0800 Subject: [PATCH 08/75] 2.16.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 65505a4e20..bb6fea0e40 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.16.0-beta \ No newline at end of file +2.16.1-beta \ No newline at end of file From f53fb08bfd26bcd98f84aebfbf2044feff30071b Mon Sep 17 00:00:00 2001 From: Niels Date: Tue, 16 May 2023 10:40:40 +0800 Subject: [PATCH 09/75] add api of contract code (#684) Co-authored-by: MIMIEYES --- .../api/constant/CommandConstant.java | 1 + .../controller/ContractController.java | 24 ++++++++ .../api/resources/ContractResource.java | 55 ++++++++++++------- .../nuls/provider/rpctools/ContractTools.java | 16 ++++++ .../constant/ContractCmdConstant.java | 1 + .../rpc/resource/ContractResource.java | 39 +++++++++++++ 6 files changed, 117 insertions(+), 19 deletions(-) diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java b/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java index 7c6899ef59..07b2b30860 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java @@ -82,5 +82,6 @@ public interface CommandConstant { //查询已注册的跨链信息 String GET_REGISTERED_CHAIN = "getRegisteredChainInfoList"; String CODE_HASH = "sc_code_hash"; + String CONTRACT_CODE = "sc_contract_code"; String COMPUTE_ADDRESS = "sc_compute_address"; } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java index 664a5a8cc0..eec948dc15 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java @@ -989,6 +989,30 @@ public RpcResult computeAddress(List params) { return ResultUtil.getJsonRpcResult(mapResult); } + @RpcMethod("contractCode") + @ApiOperation(description = "获取合约的code", order = 421) + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "contractAddress", parameterDes = "合约地址") + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的code") + })) + public RpcResult contractCode(List params) { + VerifyUtils.verifyParams(params, 2); + int chainId; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is invalid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + Result mapResult = contractTools.contractCode(chainId, params.get(1)); + return ResultUtil.getJsonRpcResult(mapResult); + } + @RpcMethod("contractCreateOffline") @ApiOperation(description = "离线 - 发布合约交易", order = 450) diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java index d49972e9d9..ba75d18525 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java @@ -584,25 +584,41 @@ public RpcClientResult invokeView(ContractViewCall form) { return ResultUtil.getRpcClientResult(mapResult); } - @POST - @Path("/codeHash") + @GET + @Path("/codeHash/{contractAddress}") @Produces(MediaType.APPLICATION_JSON) @ApiOperation(description = "获取合约的codeHash", order = 419) @Parameters(value = { - @Parameter(parameterName = "获取合约的codeHash", parameterDes = "获取合约的codeHash", requestType = @TypeDescriptor(value = ContractCodeHash.class)) + @Parameter(parameterName = "contractAddress", parameterDes = "contractAddress") }) @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "result", description = "合约的codeHash") })) - public RpcClientResult codeHash(ContractCodeHash form) { - if (form == null) { - return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "form data is empty")); + public RpcClientResult codeHash(@PathParam("contractAddress") String contractAddress) { + if (contractAddress == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "contractAddress data is empty")); } - Result mapResult = contractTools.codeHash(config.getChainId(), - form.getContractAddress()); + Result mapResult = contractTools.codeHash(config.getChainId(), contractAddress); return ResultUtil.getRpcClientResult(mapResult); } + @GET + @Path("/tx/{hash}") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "获取智能合约交易详情", order = 420) + @Parameters({ + @Parameter(parameterName = "hash", parameterDes = "交易hash") + }) + @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = ContractTransactionDto.class)) + public RpcClientResult getContractTx(@PathParam("hash") String hash) { + if (hash == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "hash is empty")); + } + Result result = contractTools.getContractTx(config.getChainId(), hash); + RpcClientResult clientResult = ResultUtil.getRpcClientResult(result); + return clientResult; + } + @POST @Path("/computeAddress") @Produces(MediaType.APPLICATION_JSON) @@ -623,20 +639,21 @@ public RpcClientResult computeAddress(ContractComputeAddress form) { } @GET - @Path("/tx/{hash}") + @Path("/contractCode/{contractAddress}") @Produces(MediaType.APPLICATION_JSON) - @ApiOperation(description = "获取智能合约交易详情", order = 420) - @Parameters({ - @Parameter(parameterName = "hash", parameterDes = "交易hash") + @ApiOperation(description = "获取合约的code", order = 422) + @Parameters(value = { + @Parameter(parameterName = "contractAddress", parameterDes = "contractAddress") }) - @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = ContractTransactionDto.class)) - public RpcClientResult getContractTx(@PathParam("hash") String hash) { - if (hash == null) { - return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "hash is empty")); + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的code") + })) + public RpcClientResult contractCode(@PathParam("contractAddress") String contractAddress) { + if (contractAddress == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "contractAddress data is empty")); } - Result result = contractTools.getContractTx(config.getChainId(), hash); - RpcClientResult clientResult = ResultUtil.getRpcClientResult(result); - return clientResult; + Result mapResult = contractTools.contractCode(config.getChainId(), contractAddress); + return ResultUtil.getRpcClientResult(mapResult); } @POST diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java index e01ed90ed1..7e906d99cb 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java @@ -291,6 +291,22 @@ public Result codeHash(int chainId, Object contractAddress) { } } + public Result contractCode(int chainId, Object contractAddress) { + Map params = new HashMap<>(); + params.put(Constants.CHAIN_ID, chainId); + params.put("contractAddress", contractAddress); + try { + return callRpc(ModuleE.SC.abbr, CONTRACT_CODE, params,(Function, Result>) res->{ + if(res == null){ + return null; + } + return new Result(res); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + public Result computeAddress(int chainId, Object sender, Object codeHash, Object salt) { Map params = new HashMap<>(); params.put(Constants.CHAIN_ID, chainId); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java index 0a40ccec73..0921220913 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java @@ -74,5 +74,6 @@ public interface ContractCmdConstant { String ACCOUNT_CONTRACTS = "sc_account_contracts"; String GET_CROSS_TOKEN_SYSTEM_CONTRACT = "sc_get_cross_token_system_contract"; String CODE_HASH = "sc_code_hash"; + String CONTRACT_CODE = "sc_contract_code"; String COMPUTE_ADDRESS = "sc_compute_address"; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java index 4c5cf9ee10..5670a90be3 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java @@ -1064,6 +1064,45 @@ public Response codeHash(Map params) { } } + @CmdAnnotation(cmd = CONTRACT_CODE, version = 1.0, description = "get code of contract") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "contractAddress", parameterDes = "合约地址"), + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "code") + })) + public Response contractCode(Map params) { + try { + Integer chainId = (Integer) params.get("chainId"); + ChainManager.chainHandle(chainId); + String contractAddress = (String) params.get("contractAddress"); + + if (!AddressTool.validAddress(chainId, contractAddress)) { + return failed(ADDRESS_ERROR); + } + byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); + if (!ContractLedgerUtil.isExistContractAddress(chainId, contractAddressBytes)) { + return failed(CONTRACT_ADDRESS_NOT_EXIST); + } + BlockHeader blockHeader = BlockCall.getLatestBlockHeader(chainId); + // 当前区块状态根 + byte[] prevStateRoot = ContractUtil.getStateRoot(blockHeader); + byte[] code = contractHelper.getContractCode(chainId, prevStateRoot, contractAddressBytes); + if (code == null) { + Result result = Result.getFailed(ContractErrorCode.DATA_NOT_FOUND); + return wrapperFailed(result); + } else { + Map resultMap = MapUtil.createLinkedHashMap(2); + resultMap.put("result", HexUtil.encode(code)); + return success(resultMap); + } + } catch (Exception e) { + Log.error(e); + return failed(e.getMessage()); + } + } + @CmdAnnotation(cmd = COMPUTE_ADDRESS, version = 1.0, description = "compute contract") @Parameters(value = { @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), From e31894fa7822059fe56d038b4be864c7747f1d49 Mon Sep 17 00:00:00 2001 From: Niels Date: Tue, 18 Jul 2023 15:53:11 +0800 Subject: [PATCH 10/75] Master update (#690) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/beta (#652) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cro… * Prod 19 (#653) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ch… * Develop add api (#654) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * 提交协议升级配置 * update block * update pom * update test case * 提交12协议升级配置--允许资产重新注册跨链 * 恢复transfer * update test case * add api for block account Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/pre prod (#655) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod 1.12.1 (#656) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#657) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#658) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#659) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * 2.12.5 (#660) * 2.12.3 * 2.12.3 * 2.12.5 * Release/pre prod -- 2.13.0 (#661) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ab… * Release/pre prod (#662) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * cmd client add command (#664) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * remove dependency-fastjson --- v2.13.1 (#671) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * 2.14.0 (#674) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * 2.15.0 (#677) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Release/pre prod (#680) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#682) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Pre prod codehash (#685) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 toke… * 2.16.0 (#689) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… --------- Signed-off-by: dependabot[bot] Co-authored-by: lijun.zhou Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- README.md | 3 +- .../io/nuls/base/signture/SignatureUtil.java | 78 ++++- common/nuls-core-rpc/pom.xml | 6 +- common/nuls-core/pom.xml | 97 +++++- .../main/java/io/nuls/core/crypto/ECKey.java | 129 +------- .../java/io/nuls/core/crypto/LazyECPoint.java | 9 +- .../io/nuls/core/model/FormatValidUtils.java | 15 + .../java/io/nuls/core/parse/JSONUtils.java | 4 +- config/nuls.beta.ncf | 2 +- module.ncf | 86 +++--- module/nuls-account/pom.xml | 10 +- .../java/io/nuls/account/tx/Transfer.java | 2 +- module/nuls-api/pom.xml | 10 +- .../api/constant/CommandConstant.java | 3 + .../controller/ContractController.java | 51 ++++ .../controller/CrossChainController.java | 83 +++++ .../api/resources/ContractResource.java | 64 +++- .../model/dto/ContractTransactionDto.java | 195 ++++++++++++ .../io/nuls/provider/model/dto/InputDto.java | 98 ++++++ .../form/contract/ContractComputeAddress.java | 67 ++++ .../nuls/provider/rpctools/ContractTools.java | 50 +++ .../io/nuls/chain/ChainManagerBootstrap.java | 4 +- .../java/io/nuls/chain/rpc/cmd/AssetCmd.java | 8 +- .../java/io/nuls/chain/rpc/cmd/ChainCmd.java | 8 +- .../nuls/chain/service/ValidateService.java | 3 + .../chain/service/impl/CmTaskManager.java | 2 +- .../service/impl/ValidateServiceImpl.java | 49 ++- .../tx/v15/AddAssetTransferProcessor.java | 109 +++++++ .../tx/v15/RegChainTransferProcessor.java | 135 ++++++++ .../src/main/resources/protocol-config.json | 25 ++ .../ledger/service/AssetRegMngService.java | 1 + .../service/impl/AssetRegMngServiceImpl.java | 37 +++ .../v15/AssetRegTransferProcessor.java | 132 ++++++++ .../src/main/resources/protocol-config.json | 24 +- module/nuls-network/pom.xml | 4 +- .../src/main/resources/versions.json | 10 + module/nuls-smart-contract/pom.xml | 15 +- .../nuls/contract/SmartContractBootStrap.java | 33 +- .../nuls/contract/config/ContractContext.java | 60 ++++ .../constant/ContractCmdConstant.java | 2 + .../contract/constant/ContractConstant.java | 9 +- .../nuls/contract/enums/TokenTypeStatus.java | 5 +- .../nuls/contract/helper/ContractHelper.java | 282 +++++++++++++---- .../contract/model/bo/ContractCreate.java | 2 +- .../contract/model/bo/ContractResult.java | 2 +- .../contract/model/dto/ContractInfoDto.java | 22 +- .../contract/model/dto/ContractResultDto.java | 21 +- .../dto/ContractToken1155TransferDto.java | 131 ++++++++ .../dto/ContractToken721TransferDto.java | 11 +- .../model/dto/ContractTokenTransferDto.java | 11 +- .../model/dto/ContractTokenTransferInfo.java | 83 ++++- .../processor/CallContractTxProcessor.java | 6 +- .../processor/CreateContractTxProcessor.java | 3 +- .../contract/rpc/call/ChainManagerCall.java | 23 +- .../rpc/resource/ContractResource.java | 183 ++++++----- .../tx/SmartContractVersionChangeInvoker.java | 15 +- .../tx/v16/CallContractProcessorV16.java | 215 +++++++++++++ .../tx/v16/CreateContractProcessorV16.java | 189 ++++++++++++ .../io/nuls/contract/util/ContractUtil.java | 191 ++++++++++-- .../java/io/nuls/contract/util/VMContext.java | 37 ++- .../src/main/java/io/nuls/contract/vm/VM.java | 9 + .../java/io/nuls/contract/vm/VMFactory.java | 39 +++ .../contract/vm/code/ClassCodeLoader.java | 18 ++ .../io/nuls/contract/sdk/NativeAddress.java | 8 + .../io/nuls/contract/sdk/NativeUtils.java | 51 ++++ .../contract/vm/program/ProgramMethod.java | 79 +---- .../contract/vm/program/ProgramMethodArg.java | 16 +- .../java/io/nuls/contract/vm/util/Utils.java | 18 ++ .../src/main/resources/nrc1155.json | 287 ++++++++++++++++++ .../src/main/resources/protocol-config.json | 25 ++ .../src/main/resources/used_classes_sdk_v15 | Bin 0 -> 14885 bytes .../io/nuls/contract/tx/base/BaseQuery.java | 4 +- .../ContractCreateSendTxTest.java | 26 +- .../io/nuls/transaction/tx/TxSignTest.java | 12 + version | 2 +- 75 files changed, 3229 insertions(+), 529 deletions(-) create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/CrossChainController.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTransactionDto.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/dto/InputDto.java create mode 100644 module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractComputeAddress.java create mode 100644 module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java create mode 100644 module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java create mode 100644 module/nuls-ledger/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java create mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java create mode 100644 module/nuls-smart-contract/src/main/resources/nrc1155.json create mode 100644 module/nuls-smart-contract/src/main/resources/used_classes_sdk_v15 diff --git a/README.md b/README.md index d804449bb3..195ab422cf 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Note: Some documents are in the process of being updated, so please understand i ## Contribution -Contributions to NULS are welcomed! We sincerely invite developers who are experienced in the blockchain field to join the NULS technology community. Details: https://nuls.community/d/9-invitation-of-community-developers. To be a great community, Nuls needs to welcome developers from all walks of life, with different backgrounds, and with a wide range of experience. +Contributions to NULS are welcomed! We sincerely invite developers who are experienced in the blockchain field to join the NULS technology community. Details: https://forum.nuls.io/c/tech/34. To be a great community, Nuls needs to welcome developers from all walks of life, with different backgrounds, and with a wide range of experience. ## License @@ -108,7 +108,6 @@ Modules added in the future may be released under a different license specified - [Facebook](https://www.facebook.com/nulscommunity/) - [YouTube channel](https://www.youtube.com/channel/UC8FkLeF4QW6Undm4B3InN1Q?view_as=subscriber) - Telegram [NULS Community](https://t.me/Nulsio) -- Telegram [NULS 中文社区](https://t.me/Nulscn) #### diff --git a/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java b/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java index d36246ac2d..45119469ad 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java +++ b/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java @@ -56,17 +56,18 @@ public class SignatureUtil { private static final int MAIN_CHAIN_ID = 1; + /** * 验证交易中所有签名正确性 * * @param chainId 当前链ID - * @param tx 交易 + * @param tx 交易 */ public static boolean validateTransactionSignture(int chainId, Transaction tx) throws NulsException { // 判断硬分叉,需要一个高度 long hardForkingHeight = 878000; boolean forked = tx.getBlockHeight() <= 0 || tx.getBlockHeight() > hardForkingHeight; - if(chainId != MAIN_CHAIN_ID) { + if (chainId != MAIN_CHAIN_ID) { forked = true; } try { @@ -132,7 +133,7 @@ public static boolean validateTransactionSignture(int chainId, Transaction tx) t * * @param tx 交易 */ - public static boolean ctxSignatureValid(int chainId,Transaction tx)throws NulsException{ + public static boolean ctxSignatureValid(int chainId, Transaction tx) throws NulsException { if (tx.getTransactionSignature() == null || tx.getTransactionSignature().length == 0) { throw new NulsException(new Exception()); } @@ -150,7 +151,7 @@ public static boolean ctxSignatureValid(int chainId,Transaction tx)throws NulsEx throw new NulsException(new Exception("Transaction signature error !")); } signAddress = AddressTool.getStringAddressByBytes(AddressTool.getAddress(signature.getPublicKey(), chainId)); - if(!fromAddressSet.contains(signAddress)){ + if (!fromAddressSet.contains(signAddress)) { continue; } fromAddressSet.remove(signAddress); @@ -159,7 +160,7 @@ public static boolean ctxSignatureValid(int chainId,Transaction tx)throws NulsEx break; } } - if(passCount < signCount || !fromAddressSet.isEmpty()){ + if (passCount < signCount || !fromAddressSet.isEmpty()) { throw new NulsException(new Exception("Transaction signature error !")); } return true; @@ -255,6 +256,73 @@ public static Set getAddressFromTX(Transaction tx, int chainId) throws N return addressSet; } + /** + * 验证签名（不包含多签），如果签名验证通过则返回签名中的地址 + * @param chainId + * @param data + * @param signatureBytes + * @return + */ + public static Set getAddressesAndVerifySignature(int chainId, byte[] data, byte[] signatureBytes) { + if (signatureBytes == null || signatureBytes.length == 0) { + return null; + } + List p2PHKSignatures; + Set addressSet = new HashSet<>(); + try { + TransactionSignature transactionSignature = new TransactionSignature(); + transactionSignature.parse(signatureBytes, 0); + p2PHKSignatures = transactionSignature.getP2PHKSignatures(); + } catch (Exception e) { + return null; + } + if ((p2PHKSignatures == null || p2PHKSignatures.size() == 0)) { + return null; + } + for (P2PHKSignature signature : p2PHKSignatures) { + try { + if(!validateSignture(data,signature)){ + return null; + } + } catch (NulsException e) { + return null; + } + if (signature.getPublicKey() != null && signature.getPublicKey().length != 0) { + addressSet.add(AddressTool.getStringAddressByBytes(AddressTool.getAddress(signature.getPublicKey(), chainId))); + } + } + return addressSet; + } + + /** + * 从签名中提取地址列表（不验证签名） + * @param chainId + * @param signatureBytes + * @return + */ + public static Set getAddressesFromSignature(int chainId, byte[] signatureBytes) { + if (signatureBytes == null || signatureBytes.length == 0) { + return null; + } + List p2PHKSignatures; + Set addressSet = new HashSet<>(); + try { + TransactionSignature transactionSignature = new TransactionSignature(); + transactionSignature.parse(signatureBytes, 0); + p2PHKSignatures = transactionSignature.getP2PHKSignatures(); + } catch (Exception e) { + return null; + } + if ((p2PHKSignatures == null || p2PHKSignatures.size() == 0)) { + return null; + } + for (P2PHKSignature signature : p2PHKSignatures) { + if (signature.getPublicKey() != null && signature.getPublicKey().length != 0) { + addressSet.add(AddressTool.getStringAddressByBytes(AddressTool.getAddress(signature.getPublicKey(), chainId))); + } + } + return addressSet; + } /** * 生成交易TransactionSignture * diff --git a/common/nuls-core-rpc/pom.xml b/common/nuls-core-rpc/pom.xml index c95e74f825..d9a721a424 100644 --- a/common/nuls-core-rpc/pom.xml +++ b/common/nuls-core-rpc/pom.xml @@ -52,14 +52,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 javax.xml.bind jaxb-api - 2.3.0 + 2.3.1 @@ -72,7 +72,7 @@ io.netty netty-all - 4.1.42.Final + 4.1.72.Final com.google.protobuf diff --git a/common/nuls-core/pom.xml b/common/nuls-core/pom.xml index b29eba9aaf..ebec42455a 100644 --- a/common/nuls-core/pom.xml +++ b/common/nuls-core/pom.xml @@ -23,6 +23,12 @@ ch.qos.logback logback-access ${logback.version} + + + logback-core + ch.qos.logback + + ch.qos.logback @@ -33,37 +39,118 @@ ch.qos.logback logback-classic ${logback.version} + + + logback-core + ch.qos.logback + + + slf4j-api + org.slf4j + + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.9.9 + 2.13.3 com.fasterxml.jackson.core jackson-annotations + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + 2.13.3 + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.13.3 + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + jakarta.activation + jakarta.activation-api + + + + + jakarta.activation-api + jakarta.activation + 1.2.2 + + + com.fasterxml.jackson.core + jackson-core + 2.13.3 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.3 + + + jackson-annotations + com.fasterxml.jackson.core + + + jackson-core + com.fasterxml.jackson.core + com.fasterxml.jackson.core jackson-annotations - 2.9.9 + 2.13.3 com.fasterxml.jackson.module jackson-module-afterburner - 2.9.9 + 2.13.3 org.bouncycastle bcprov-jdk15on - 1.62 + 1.67 @@ -79,7 +166,7 @@ com.google.guava guava - 29.0-jre + 31.0.1-jre compile diff --git a/common/nuls-core/src/main/java/io/nuls/core/crypto/ECKey.java b/common/nuls-core/src/main/java/io/nuls/core/crypto/ECKey.java index e60a786f1f..279ae570e4 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/crypto/ECKey.java +++ b/common/nuls-core/src/main/java/io/nuls/core/crypto/ECKey.java @@ -43,6 +43,7 @@ import org.bouncycastle.math.ec.FixedPointUtil; import org.bouncycastle.math.ec.custom.sec.SecP256K1Curve; import org.bouncycastle.util.Properties; +import org.bouncycastle.util.encoders.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -197,40 +198,6 @@ protected ECKey(@Nullable BigInteger priv, LazyECPoint pub) { this.pub = checkNotNull(pub); } - /** - * Utility for compressing an elliptic curve point. Returns the same point if it's already compressed. - * See the ECKey class docs for a discussion of point compression. - */ - public static ECPoint compressPoint(ECPoint point) { - return getPointWithCompression(point, true); - } - - public static LazyECPoint compressPoint(LazyECPoint point) { - return point.isCompressed() ? point : new LazyECPoint(compressPoint(point.get())); - } - - /** - * Utility for decompressing an elliptic curve point. Returns the same point if it's already compressed. - * See the ECKey class docs for a discussion of point compression. - */ - public static ECPoint decompressPoint(ECPoint point) { - return getPointWithCompression(point, false); - } - - public static LazyECPoint decompressPoint(LazyECPoint point) { - return !point.isCompressed() ? point : new LazyECPoint(decompressPoint(point.get())); - } - - private static ECPoint getPointWithCompression(ECPoint point, boolean compressed) { - if (point.isCompressed() == compressed) { - return point; - } - point = point.normalize(); - BigInteger x = point.getAffineXCoord().toBigInteger(); - BigInteger y = point.getAffineYCoord().toBigInteger(); - return CURVE.getCurve().createPoint(x, y, compressed); - } - /** * Construct an ECKey from an ASN.1 encoded private key. These are produced by OpenSSL and stored by Bitcoin * Core in its wallet. Note that this is slow because it requires an EC point multiply. @@ -244,16 +211,8 @@ public static ECKey fromASN1(byte[] asn1privkey) { * public key is compressed. */ public static ECKey fromPrivate(BigInteger privKey) { - return fromPrivate(privKey, true); - } - - /** - * Creates an ECKey given the private key only. The public key is calculated from it (this is slow), either - * compressed or not. - */ - public static ECKey fromPrivate(BigInteger privKey, boolean compressed) { ECPoint point = publicPointFromPrivate(privKey); - return new ECKey(privKey, getPointWithCompression(point, compressed)); + return new ECKey(privKey, point); } /** @@ -264,14 +223,6 @@ public static ECKey fromPrivate(byte[] privKeyBytes) { return fromPrivate(new BigInteger(1, privKeyBytes)); } - /** - * Creates an ECKey given the private key only. The public key is calculated from it (this is slow), either - * compressed or not. - */ - public static ECKey fromPrivate(byte[] privKeyBytes, boolean compressed) { - return fromPrivate(new BigInteger(1, privKeyBytes), compressed); - } - /** * Creates an ECKey that simply trusts the caller to ensure that point is really the result of multiplying the * generator point by the private key. This is used to speed things up when you know you have the right values @@ -322,67 +273,6 @@ public static ECKey fromPublicOnly(byte[] pub) { return new ECKey(null, CURVE.getCurve().decodePoint(pub)); } - /** - * Returns a copy of this key, but with the public point represented in uncompressed form. Normally you would - * never need this: it's for specialised scenarios or when backwards compatibility in encoded form is necessary. - */ - public ECKey decompress() { - if (!pub.isCompressed()) { - return this; - } else { - return new ECKey(priv, decompressPoint(pub.get())); - } - } - - /** - * Creates an ECKey given only the private key bytes. This is the same as using the BigInteger constructor, but - * is more convenient if you are importing a key from elsewhere. The public key will be automatically derived - * from the private key. - */ - @Deprecated - public ECKey(@Nullable byte[] privKeyBytes, @Nullable byte[] pubKey) { - this(privKeyBytes == null ? null : new BigInteger(1, privKeyBytes), pubKey); - } - - - /** - * Creates an ECKey given either the private key only, the public key only, or both. If only the private key - * is supplied, the public key will be calculated from it (this is slow). If both are supplied, it's assumed - * the public key already correctly matches the private key. If only the public key is supplied, this ECKey cannot - * be used for signing. - * - * @param compressed If set to true and pubKey is null, the derived public key will be in compressed form. - */ - @Deprecated - public ECKey(@Nullable BigInteger privKey, @Nullable byte[] pubKey, boolean compressed) { - if (privKey == null && pubKey == null) { - throw new IllegalArgumentException("ECKey requires at least private or public key"); - } - this.priv = privKey; - if (pubKey == null) { - // Derive public from private. - ECPoint point = publicPointFromPrivate(privKey); - point = getPointWithCompression(point, compressed); - this.pub = new LazyECPoint(point); - } else { - // We expect the pubkey to be in regular encoded form, just as a BigInteger. Therefore the first byte is - // a special marker byte. - // TODO: This is probably not a useful API and may be confusing. - this.pub = new LazyECPoint(CURVE.getCurve(), pubKey); - } - } - - /** - * Creates an ECKey given either the private key only, the public key only, or both. If only the private key - * is supplied, the public key will be calculated from it (this is slow). If both are supplied, it's assumed - * the public key already correctly matches the public key. If only the public key is supplied, this ECKey cannot - * be used for signing. - */ - @Deprecated - private ECKey(@Nullable BigInteger privKey, @Nullable byte[] pubKey) { - this(privKey, pubKey, false); - } - /** * Returns true if this key doesn't have unencrypted access to private key bytes. This may be because it was never * given any private key bytes to begin with (a watching key), or because the key is encrypted. You can use @@ -414,7 +304,7 @@ public static byte[] publicKeyFromPrivate(BigInteger privKey, boolean compressed */ public static ECPoint publicPointFromPrivate(BigInteger privKey) { /* - * TODO: FixedPointCombMultiplier currently doesn't support scalars longer than the group order, + * FixedPointCombMultiplier currently doesn't support scalars longer than the group order, * but that could change in future versions. */ if (privKey.bitLength() > CURVE.getN().bitLength()) { @@ -649,6 +539,14 @@ protected byte[] doSign(byte[] input, BigInteger privateKeyForSigning) { return new ECDSASignature(components[0], components[1]).toCanonicalised().encodeToDER(); } + protected ECDSASignature sign(byte[] input, BigInteger privateKeyForSigning) { + HexUtil.checkNotNull(privateKeyForSigning); + ECDSASigner signer = new ECDSASigner(new HMacDSAKCalculator(new SHA256Digest())); + ECPrivateKeyParameters privKey = new ECPrivateKeyParameters(privateKeyForSigning, CURVE); + signer.init(true, privKey); + BigInteger[] components = signer.generateSignature(input); + return new ECDSASignature(components[0], components[1]); + } /** *

Verifies the given ECDSA signature against the message bytes using the public key bytes.

@@ -687,7 +585,7 @@ public static boolean verify(byte[] data, byte[] signature, byte[] pub) { /** * 用私钥对数据进行签名 * - * @param hash 需签名数据 + * @param hash 需签名数据 * @return byte[] 签名 */ public byte[] sign(Sha256Hash hash) { @@ -784,8 +682,7 @@ private static ECKey extractKeyFromASN1(byte[] asn1privkey) { checkArgument(encoding >= 2 && encoding <= 4, "Input has 'publicKey' with invalid encoding"); // Now sanity check to ensure the pubkey bytes match the privkey. - boolean compressed = (pubbits.length == 33); - ECKey key = new ECKey(privkey, null, compressed); + ECKey key = ECKey.fromPrivate(privkey); if (!Arrays.equals(key.getPubKey(), pubbits)) { throw new IllegalArgumentException("Public key in ASN.1 structure does not match private key."); } diff --git a/common/nuls-core/src/main/java/io/nuls/core/crypto/LazyECPoint.java b/common/nuls-core/src/main/java/io/nuls/core/crypto/LazyECPoint.java index 22318941e2..f9d73f61a5 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/crypto/LazyECPoint.java +++ b/common/nuls-core/src/main/java/io/nuls/core/crypto/LazyECPoint.java @@ -71,7 +71,7 @@ public byte[] getEncoded() { if (bits != null) { return Arrays.copyOf(bits, bits.length); } else { - return get().getEncoded(); + return get().getEncoded(true); } } @@ -96,11 +96,10 @@ public boolean isNormalized() { } public boolean isCompressed() { - if (bits != null) { - return bits[0] == 2 || bits[0] == 3; - } else { - return get().isCompressed(); + if (bits == null) { + return false; } + return bits[0] == 2 || bits[0] == 3; } public ECPoint multiply(BigInteger k) { diff --git a/common/nuls-core/src/main/java/io/nuls/core/model/FormatValidUtils.java b/common/nuls-core/src/main/java/io/nuls/core/model/FormatValidUtils.java index 356a98c13c..e18912c245 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/model/FormatValidUtils.java +++ b/common/nuls-core/src/main/java/io/nuls/core/model/FormatValidUtils.java @@ -70,7 +70,22 @@ public static boolean validTokenNameOrSymbol(String name) { } return name.matches("^([a-zA-Z0-9]+[a-zA-Z0-9_]*[a-zA-Z0-9]+)|[a-zA-Z0-9]+${1,20}"); } + public static boolean validTokenNameOrSymbolV15(String name) { + if (StringUtils.isBlank(name)) { + return false; + } + + String upperCaseName = name.toUpperCase(); + if(upperCaseName.equals(NULS)) { + return false; + } + byte[] aliasBytes = name.getBytes(StandardCharsets.UTF_8); + if (aliasBytes.length < 1 || aliasBytes.length > 20) { + return false; + } + return name.matches("^([a-zA-Z0-9]+[a-zA-Z0-9_]*[a-zA-Z0-9]+)|[a-zA-Z0-9]+${1,20}"); + } /** * 备注规则: 可以为空,或者不大于60字节 * @param remark 备注 diff --git a/common/nuls-core/src/main/java/io/nuls/core/parse/JSONUtils.java b/common/nuls-core/src/main/java/io/nuls/core/parse/JSONUtils.java index 4769cc3fcf..6f79381f52 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/parse/JSONUtils.java +++ b/common/nuls-core/src/main/java/io/nuls/core/parse/JSONUtils.java @@ -145,7 +145,7 @@ public static Map jsonToMap(String jsonStr) * @return 转换得到的MAP */ public static Map json2map(String jsonStr, Class clazz) throws IOException { - Map> map = OBJECT_MAPPER.readValue(jsonStr, new TypeReference>() { + Map> map = OBJECT_MAPPER.readValue(jsonStr, new TypeReference>>() { }); Map result = new HashMap<>(); for (Map.Entry> entry : map.entrySet()) { @@ -162,7 +162,7 @@ public static Map json2map(String jsonStr, Class clazz) throws * @return 转换后得到的List */ public static List json2list(String jsonArrayStr, Class clazz) throws IOException { - List> list = OBJECT_MAPPER.readValue(jsonArrayStr, new TypeReference>() { + List> list = OBJECT_MAPPER.readValue(jsonArrayStr, new TypeReference>>() { }); List result = new ArrayList(); for (Map map : list) { diff --git a/config/nuls.beta.ncf b/config/nuls.beta.ncf index b4ddfcd0c4..935449c9c1 100755 --- a/config/nuls.beta.ncf +++ b/config/nuls.beta.ncf @@ -86,7 +86,7 @@ inflationAmount=41095890410959 #通胀开始计算时间(单位:S)2020-07-12 00:00:00 initTime=1594483200 #通缩比例(如果没有通缩则设为100) -deflationRatio=99.6 +deflationRatio=0.4 #通缩间隔时间(单位：S),30天 deflationTimeInterval=2592000 diff --git a/module.ncf b/module.ncf index bc0c1f9d8a..7f89ca8a2c 100644 --- a/module.ncf +++ b/module.ncf @@ -1,45 +1,47 @@ [global] encoding=UTF-8 language=en -logPath=../../../../Logs -logLevel=DEBUG -dataPath=../../../../data +logPath=/Users/niels/workspace/nuls-v2/logs +logLevel=INFO +dataPath=/Users/niels/workspace/nuls-v2/data #默认本链ID -chainId=2 +chainId=1 #地址前缀 -addressPrefix=tNULS +addressPrefix=NULS #默认本链主资产ID assetId=1 #默认资产小数位数 decimals=8 #默认链名称 -chainName=nuls2 +chainName=nuls #本链默认资产符号 symbol=NULS #主网链id -mainChainId=2 +mainChainId=1 #主网主资产id mainAssetId=1 #主网主资产符号 mainSymbol=NULS blackHolePublicKey=000000000000000000000000000000000000000000000000000000000000000000 +packageVersion=%PACKAGE_VERSION% + [network] -port=18001 -crossPort=18002 +port=8001 +crossPort=8002 #魔法参数 -packetMagic=202001177 +packetMagic=20191222 #种子节点 -selfSeedIps=192.168.5.104:18001,192.168.5.10:18001,192.168.5.40:18001 +selfSeedIps=seeda.nuls.io:8001,seedb.nuls.io:8001,seedc.nuls.io:8001,seedd.nuls.io:8001,seede.nuls.io:8001,seedf.nuls.io:8001 #主网的跨链种子连接节点 -moonSeedIps=192.168.5.104:18002,192.168.5.10:18002,192.168.5.40:18002 +moonSeedIps=seeda.nuls.io:8002,seedb.nuls.io:8002,seedc.nuls.io:8002,seedd.nuls.io:8002,seede.nuls.io:8002,seedf.nuls.io:8002 #最大入网连接数 maxInCount=300 #最大出网连接数 maxOutCount=20 [account] -blockAccountManager=tNULSeBaNE8nFpFo6qYiPiNHSbsGyKSceJLwQt +blockAccountManager=NULSd6Hh5e4o3N3y6FnHeGhECFXrETqSzbapx keystoreFolder=/keystore/backup dependent=protocol-update @@ -59,18 +61,19 @@ singleDownloadTimeout=15000 #区块同步过程中缓存的区块字节数上限(20M) cachedBlockSizeLimit=20971520 #创世块文件路径(支持绝对路径与相对路径,相对路径相对于此配置文件的目录) -genesisBlockPath=genesis-block_dev.json +genesisBlockPath=genesis-block.json dependent=cross-chain,protocol-update,smart-contract + [consensus] #种子节点列表 -seedNodes=tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp,tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe,tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF +seedNodes=NULSd6Hge7xHDnvsSpnzbR2gWHd31zJ1How11,NULSd6Hgc5VNP4rF4wxdiXEQKpBKUE4w5RS22,NULSd6HgeQwXLdre69ArkqVZNDqMLU4CaAz33,NULSd6HgcjAKAgq8jjXgBCcNLEJUvJEYcoj44,NULSd6HgiDdTjcuvhqzm3bomyBFZmosV3ei55 #出块地址密码 password=nuls123456 #出块间隔时间(单位：s) packingInterval=10 #共识委托抵押资产链ID -agentChainId=2 +agentChainId=1 #共识委托抵押资产ID agentAssetId=1 #共识奖励资产ID(共识奖励必须为本链资产) @@ -87,21 +90,15 @@ initTime=1594483200 deflationRatio=0.4 #通缩间隔时间(单位：S),30天 deflationTimeInterval=2592000 -dataPath=../../../../../data -logPath=../../../../../Logs dependent=protocol-update,smart-contract,cross-chain -[transaction] -dependent=protocol-update,smart-contract - [ledger] dependent=protocol-update [smart-contract] #合约视图方法调用最大消耗的Gas maxViewGas=100000000 -systemLogLevel=WARN -crossTokenSystemContract=tNULSeBaMy9k29Nj4rd3U4tonVr93mrDLHMNNd +crossTokenSystemContract=NULSd6HgsyGNK1xTcx2GnC9y3Jr1DKd3qL2HS dependent=protocol-update [chain-manager] @@ -109,9 +106,9 @@ dependent=smart-contract,protocol-update [public-service] #public-service模块对外的rpc端口号 -rpcPort=18003 +rpcPort=8003 #数据库url地址 -databaseUrl=192.168.1.39 +databaseUrl=127.0.0.1 #数据库端口号 databasePort=27017 #连接池最大数 @@ -122,8 +119,19 @@ maxWaitTime=120000 socketTimeout=300000 #连接超时时间 connectTimeOut=30000 +developerNodeAddress=NULSd6Hgf15aUZj6918tEwy9aT4JG1ZQotXRF +ambassadorNodeAddress=NULSd6HgcfGtsmm79QDoBK1MAjqNmm3rgKXSj +mappingAddress=NULSd6HgcfwWCD5TLEfehrJ1fFYuZ6nqGbfiu,NULSd6HggAGpQbhhSHU9R1yRxKKuCCTFwayaB +businessAddress=NULSd6HhDrCkRJBj9nX1Gr1PnuQP7bpQz3YfH,NULSd6HhDMDJASAH7VxLRY9Btff1k3ezpM66w +teamAddress=NULSd6Hh6m73yRYCn8ff2jo9qN93bh4GpzFDn +communityAddress=NULSd6Hh76ja8dHkTdYvTJS9gEAygiU1uLRGR,NULSd6Hh84g7u61ntrWhrdEMjXvM9STRPxFZx,NULSd6Hh8xn55HeTWKwRAG31fj2eHtq6Aw2Rg +syncCoinBase=false +syncAddress= dependent=smart-contract,cross-chain,chain-manager +[transaction] +dependent=protocol-update,smart-contract + [cross-chain] #跨链节点链接的最小值 minNodeAmount=3 @@ -132,29 +140,35 @@ sendHeight=6 #跨链交易拜占庭比例 byzantineRatio=66 #主网跨链种子节点列表 -crossSeedIps=192.168.5.104:18002,192.168.5.10:18002,192.168.5.40:18002 +crossSeedIps=seeda.nuls.io:8002,seedb.nuls.io:8002,seedc.nuls.io:8002,seedd.nuls.io:8002,seede.nuls.io:8002,seedf.nuls.io:8002 #主网验证人列表 -verifiers=tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp,tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe,tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF +verifiers=NULSd6Hge7xHDnvsSpnzbR2gWHd31zJ1How11,NULSd6Hgc5VNP4rF4wxdiXEQKpBKUE4w5RS22,NULSd6HgeQwXLdre69ArkqVZNDqMLU4CaAz33,NULSd6HgcjAKAgq8jjXgBCcNLEJUvJEYcoj44,NULSd6HgiDdTjcuvhqzm3bomyBFZmosV3ei55 #主网签名拜占庭比列 mainByzantineRatio=66 #主网最大签名数 maxSignatureCount=100 -dataPath=../../../../../data -logPath=../../../../../Logs dependent=protocol-update,smart-contract +[protocol-update] +#每隔多少个区块统计一次协议占比 +interval=1000 +dependent=smart-contract,cross-chain + [nuls-api] #httpServer的启动ip serverIp=0.0.0.0 #httpServer的启动port -serverPort=18004 +serverPort=8004 dependent=smart-contract,cross-chain,chain-manager -[protocol-update] -continuousIntervalCountMinimum=2 -#每隔多少个区块统计一次协议占比 -interval=2 +[nuls-module-web-wallet] +apiModuleApi=http://127.0.0.1:8003/ +webWalletPort=8006 +webWalletHost=0.0.0.0 dependent=smart-contract,cross-chain -[cmd-client] -clientVersion=2.7.0 +[nuls-module-explorer] +apiModuleApi=http://127.0.0.1:8003/ +explorerPort=1999 +explorerHost=0.0.0.0 + diff --git a/module/nuls-account/pom.xml b/module/nuls-account/pom.xml index ca25e652f7..26d5d5e0eb 100644 --- a/module/nuls-account/pom.xml +++ b/module/nuls-account/pom.xml @@ -9,6 +9,14 @@ 1.0.0-SNAPSHOT nuls-account + + + + nuls-release + nuls-release + https://nexus.nuls.io/repository/nuls-release/ + + io.nuls.sdk @@ -24,7 +32,7 @@ io.nuls.v2 sdk4j - 1.1.6.RELEASE + 1.1.7.RELEASE test diff --git a/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java b/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java index a389187ad4..2e161ad1a5 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java +++ b/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java @@ -237,7 +237,7 @@ public void accountBlockMultiSignTest() throws Exception { System.out.println(Arrays.toString(set.toArray())); data.setAddresses(set.toArray(new String[set.size()]));*/ data.setAddresses(new String[]{ - "NULSd6Hgbcn7gdGuapjgM8QsSTBtqsgKZ7Y8v" + "NULSd6HgUGY1T1QaYYkw4BoA3YH4WmPkJ16hK\n" }); tx.setTxData(data.serialize()); tx.setTime(System.currentTimeMillis() / 1000); diff --git a/module/nuls-api/pom.xml b/module/nuls-api/pom.xml index 7ebae20a72..1686101496 100644 --- a/module/nuls-api/pom.xml +++ b/module/nuls-api/pom.xml @@ -20,7 +20,13 @@ 1.0.0-SNAPSHOT false - + + + nuls-release + nuls-release + https://nexus.nuls.io/repository/nuls-release/ + + io.nuls.v2 @@ -36,7 +42,7 @@ io.nuls.v2 sdk4j - 1.1.6.RELEASE + 1.1.7.RELEASE io.nuls.v2 diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java b/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java index 6ee8950cf0..07b2b30860 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/constant/CommandConstant.java @@ -56,6 +56,7 @@ public interface CommandConstant { String CONTRACT_INFO = "sc_contract_info"; //查询智能合约执行结果 String CONTRACT_RESULT = "sc_contract_result"; + String CONTRACT_TX = "sc_contract_tx"; //查询智能合约构造函数 String CONSTRUCTOR = "sc_constructor"; //验证创建合约 @@ -81,4 +82,6 @@ public interface CommandConstant { //查询已注册的跨链信息 String GET_REGISTERED_CHAIN = "getRegisteredChainInfoList"; String CODE_HASH = "sc_code_hash"; + String CONTRACT_CODE = "sc_contract_code"; + String COMPUTE_ADDRESS = "sc_compute_address"; } diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java index 7b0d1d4b98..eec948dc15 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/ContractController.java @@ -962,6 +962,57 @@ public RpcResult codeHash(List params) { return ResultUtil.getJsonRpcResult(mapResult); } + @RpcMethod("computeAddress") + @ApiOperation(description = "计算合约地址", order = 420) + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "sender", parameterDes = "sender"), + @Parameter(parameterName = "codeHash", parameterDes = "codeHash"), + @Parameter(parameterName = "salt", parameterDes = "salt") + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "contractAddress", description = "合约地址") + })) + public RpcResult computeAddress(List params) { + VerifyUtils.verifyParams(params, 4); + int chainId; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is invalid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + int i = 1; + Result mapResult = contractTools.computeAddress(chainId, params.get(i++), params.get(i++), params.get(i++)); + return ResultUtil.getJsonRpcResult(mapResult); + } + + @RpcMethod("contractCode") + @ApiOperation(description = "获取合约的code", order = 421) + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "contractAddress", parameterDes = "合约地址") + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的code") + })) + public RpcResult contractCode(List params) { + VerifyUtils.verifyParams(params, 2); + int chainId; + try { + chainId = (int) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[chainId] is invalid"); + } + if (!Context.isChainExist(chainId)) { + return RpcResult.paramError(String.format("chainId [%s] is invalid", chainId)); + } + Result mapResult = contractTools.contractCode(chainId, params.get(1)); + return ResultUtil.getJsonRpcResult(mapResult); + } + @RpcMethod("contractCreateOffline") @ApiOperation(description = "离线 - 发布合约交易", order = 450) diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/CrossChainController.java b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/CrossChainController.java new file mode 100644 index 0000000000..2d916689d5 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/CrossChainController.java @@ -0,0 +1,83 @@ +/* + * MIT License + * Copyright (c) 2017-2019 nuls.io + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package io.nuls.provider.api.jsonrpc.controller; + +import io.nuls.base.api.provider.Result; +import io.nuls.base.api.provider.ServiceManager; +import io.nuls.base.api.provider.block.BlockService; +import io.nuls.base.api.provider.block.facade.GetBlockHeaderByLastHeightReq; +import io.nuls.base.api.provider.crosschain.CrossChainProvider; +import io.nuls.base.api.provider.crosschain.facade.RehandleCtxReq; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Controller; +import io.nuls.core.core.annotation.RpcMethod; +import io.nuls.core.rpc.model.Parameter; +import io.nuls.core.rpc.model.Parameters; +import io.nuls.core.rpc.model.ResponseData; +import io.nuls.core.rpc.model.TypeDescriptor; +import io.nuls.provider.model.jsonrpc.RpcErrorCode; +import io.nuls.provider.model.jsonrpc.RpcResult; +import io.nuls.provider.utils.VerifyUtils; +import io.nuls.v2.model.annotation.Api; +import io.nuls.v2.model.annotation.ApiOperation; +import io.nuls.v2.model.annotation.ApiType; + +import java.util.List; + +/** + * @author Niels + */ +@Controller +@Api(type = ApiType.JSONRPC) +public class CrossChainController { + + private BlockService blockService = ServiceManager.get(BlockService.class); + + private CrossChainProvider crossChainProvider = ServiceManager.get(CrossChainProvider.class); + public CrossChainController(){ + System.out.println(); + } + + @RpcMethod("rehandlectx") + @ApiOperation(description = "重发已经卡主的交易", order = 901, detailDesc = "重发只代表本节点的尝试，不能保证最终结果") + @Parameters(value = { + @Parameter(parameterName = "hash", requestType = @TypeDescriptor(value = String.class), parameterDes = "跨链交易的hash") + }) + @ResponseData(name = "返回值", description = "是否成功", responseType = @TypeDescriptor(value = Boolean.class)) + public RpcResult createAccount(List params) { + VerifyUtils.verifyParams(params, 1); + String hash; + try { + hash = (String) params.get(0); + } catch (Exception e) { + return RpcResult.paramError("[hash] is inValid"); + } + + long blockHeight = blockService.getBlockHeaderByLastHeight(new GetBlockHeaderByLastHeightReq()).getData().getHeight(); + Result result = crossChainProvider.rehandleCtx(new RehandleCtxReq(hash, blockHeight)); + if (result.isFailed()) { + return RpcResult.failed(RpcErrorCode.SYS_UNKNOWN_EXCEPTION); + } + return RpcResult.success(true); + } + + +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java index 16e4051dd1..ba75d18525 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/api/resources/ContractResource.java @@ -584,25 +584,77 @@ public RpcClientResult invokeView(ContractViewCall form) { return ResultUtil.getRpcClientResult(mapResult); } - @POST - @Path("/codeHash") + @GET + @Path("/codeHash/{contractAddress}") @Produces(MediaType.APPLICATION_JSON) @ApiOperation(description = "获取合约的codeHash", order = 419) @Parameters(value = { - @Parameter(parameterName = "获取合约的codeHash", parameterDes = "获取合约的codeHash", requestType = @TypeDescriptor(value = ContractCodeHash.class)) + @Parameter(parameterName = "contractAddress", parameterDes = "contractAddress") }) @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { @Key(name = "result", description = "合约的codeHash") })) - public RpcClientResult codeHash(ContractCodeHash form) { + public RpcClientResult codeHash(@PathParam("contractAddress") String contractAddress) { + if (contractAddress == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "contractAddress data is empty")); + } + Result mapResult = contractTools.codeHash(config.getChainId(), contractAddress); + return ResultUtil.getRpcClientResult(mapResult); + } + + @GET + @Path("/tx/{hash}") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "获取智能合约交易详情", order = 420) + @Parameters({ + @Parameter(parameterName = "hash", parameterDes = "交易hash") + }) + @ResponseData(name = "返回值", responseType = @TypeDescriptor(value = ContractTransactionDto.class)) + public RpcClientResult getContractTx(@PathParam("hash") String hash) { + if (hash == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "hash is empty")); + } + Result result = contractTools.getContractTx(config.getChainId(), hash); + RpcClientResult clientResult = ResultUtil.getRpcClientResult(result); + return clientResult; + } + + @POST + @Path("/computeAddress") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "计算合约地址", order = 421) + @Parameters(value = { + @Parameter(parameterName = "计算合约地址", parameterDes = "计算合约地址", requestType = @TypeDescriptor(value = ContractComputeAddress.class)) + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的codeHash") + })) + public RpcClientResult computeAddress(ContractComputeAddress form) { if (form == null) { return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "form data is empty")); } - Result mapResult = contractTools.codeHash(config.getChainId(), - form.getContractAddress()); + Result mapResult = contractTools.computeAddress(config.getChainId(), + form.getSender(), form.getCodeHash(), form.getSalt()); return ResultUtil.getRpcClientResult(mapResult); } + @GET + @Path("/contractCode/{contractAddress}") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation(description = "获取合约的code", order = 422) + @Parameters(value = { + @Parameter(parameterName = "contractAddress", parameterDes = "contractAddress") + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "合约的code") + })) + public RpcClientResult contractCode(@PathParam("contractAddress") String contractAddress) { + if (contractAddress == null) { + return RpcClientResult.getFailed(new ErrorData(CommonCodeConstanst.PARAMETER_ERROR.getCode(), "contractAddress data is empty")); + } + Result mapResult = contractTools.contractCode(config.getChainId(), contractAddress); + return ResultUtil.getRpcClientResult(mapResult); + } @POST @Path("/create/offline") diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTransactionDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTransactionDto.java new file mode 100644 index 0000000000..491a576295 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/ContractTransactionDto.java @@ -0,0 +1,195 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package io.nuls.provider.model.dto; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; +import io.nuls.core.rpc.model.Key; +import io.nuls.core.rpc.model.TypeDescriptor; + +import java.util.List; +import java.util.Map; + +/** + * @author: PierreLuo + */ +@ApiModel +public class ContractTransactionDto { + + @ApiModelProperty(description = "交易hash") + private String hash; + @ApiModelProperty(description = "交易类型") + private Integer type; + @ApiModelProperty(description = "交易时间") + private Long time; + @ApiModelProperty(description = "区块高度") + private Long blockHeight; + @ApiModelProperty(description = "交易手续费") + private String fee; + @ApiModelProperty(description = "交易金额") + private String value; + @ApiModelProperty(description = "备注") + private String remark; + @ApiModelProperty(description = "签名信息") + private String scriptSig; + @ApiModelProperty(description = "交易状态（0 - 确认中，1 - 已确认）") + private Integer status; + @ApiModelProperty(description = "交易确认次数") + private Long confirmCount; + @ApiModelProperty(description = "交易大小") + private int size; + @ApiModelProperty(description = "交易输入集合", type = @TypeDescriptor(value = List.class, collectionElement = InputDto.class)) + private List inputs; + @ApiModelProperty(description = "交易输出集合", type = @TypeDescriptor(value = List.class, collectionElement = OutputDto.class)) + private List outputs; + @ApiModelProperty(description = "合约交易业务数据", type = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "data", description = "根据合约交易类型反映不同的业务数据（这里为了描述四种情况，四种业务放在一起描述，实际上不同时存在，只存在一个）") + })) + private Map txData; + @ApiModelProperty(description = "合约执行结果") + private ContractResultDto contractResult; + + + public String getHash() { + return hash; + } + + public void setHash(String hash) { + this.hash = hash; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Long getTime() { + return time; + } + + public void setTime(Long time) { + this.time = time; + } + + public Long getBlockHeight() { + return blockHeight; + } + + public void setBlockHeight(Long blockHeight) { + this.blockHeight = blockHeight; + } + + public String getFee() { + return fee; + } + + public void setFee(String fee) { + this.fee = fee; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getScriptSig() { + return scriptSig; + } + + public void setScriptSig(String scriptSig) { + this.scriptSig = scriptSig; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Long getConfirmCount() { + return confirmCount; + } + + public void setConfirmCount(Long confirmCount) { + this.confirmCount = confirmCount; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public List getInputs() { + return inputs; + } + + public void setInputs(List inputs) { + this.inputs = inputs; + } + + public List getOutputs() { + return outputs; + } + + public void setOutputs(List outputs) { + this.outputs = outputs; + } + + public Map getTxData() { + return txData; + } + + public void setTxData(Map txData) { + this.txData = txData; + } + + public ContractResultDto getContractResult() { + return contractResult; + } + + public void setContractResult(ContractResultDto contractResult) { + this.contractResult = contractResult; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/dto/InputDto.java b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/InputDto.java new file mode 100644 index 0000000000..3b0c1438a2 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/dto/InputDto.java @@ -0,0 +1,98 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +package io.nuls.provider.model.dto; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; + +/** + * @author: PierreLuo + * @date: 2019-03-14 + */ +@ApiModel +public class InputDto { + @ApiModelProperty(description = "输入地址") + private String address; + @ApiModelProperty(description = "资产链ID") + private int assetsChainId; + @ApiModelProperty(description = "资产ID") + private int assetsId; + @ApiModelProperty(description = "花费金额") + private String amount; + @ApiModelProperty(description = "地址的账本nonce值") + private String nonce; + @ApiModelProperty(description = "解锁交易的标签（0 - 非解锁交易，1 - 解锁交易）") + private byte locked; + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public int getAssetsChainId() { + return assetsChainId; + } + + public void setAssetsChainId(int assetsChainId) { + this.assetsChainId = assetsChainId; + } + + public int getAssetsId() { + return assetsId; + } + + public void setAssetsId(int assetsId) { + this.assetsId = assetsId; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } + + public String getNonce() { + return nonce; + } + + public void setNonce(String nonce) { + this.nonce = nonce; + } + + public byte getLocked() { + return locked; + } + + public void setLocked(byte locked) { + this.locked = locked; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractComputeAddress.java b/module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractComputeAddress.java new file mode 100644 index 0000000000..2a356c8414 --- /dev/null +++ b/module/nuls-api/src/main/java/io/nuls/provider/model/form/contract/ContractComputeAddress.java @@ -0,0 +1,67 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.provider.model.form.contract; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; +import io.nuls.v2.util.ContractUtil; + +import java.math.BigInteger; + +@ApiModel +public class ContractComputeAddress { + + @ApiModelProperty(description = "交易创建者") + private String sender; + @ApiModelProperty(description = "codeHash") + private String codeHash; + @ApiModelProperty(description = "salts", required = false) + private Object[] salt; + + public String getSender() { + return sender; + } + + public void setSender(String sender) { + this.sender = sender; + } + + public String getCodeHash() { + return codeHash; + } + + public void setCodeHash(String codeHash) { + this.codeHash = codeHash; + } + + public Object[] getSalt() { + return salt; + } + + public void setSalt(Object[] salt) { + this.salt = salt; + } +} diff --git a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java index bdcd26ce7b..7e906d99cb 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/rpctools/ContractTools.java @@ -71,6 +71,22 @@ public Result getContractResult(int chainId, String hash) { } } + public Result getContractTx(int chainId, String hash) { + Map params = new HashMap(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("hash", hash); + try { + return callRpc(ModuleE.SC.abbr, CONTRACT_TX, params,(Function, Result>) res->{ + if(res == null){ + return new Result(); + } + return new Result(res); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + public Result getContractResultList(int chainId, List hashList) { Map params = new HashMap(4); params.put(Constants.CHAIN_ID, chainId); @@ -275,4 +291,38 @@ public Result codeHash(int chainId, Object contractAddress) { } } + public Result contractCode(int chainId, Object contractAddress) { + Map params = new HashMap<>(); + params.put(Constants.CHAIN_ID, chainId); + params.put("contractAddress", contractAddress); + try { + return callRpc(ModuleE.SC.abbr, CONTRACT_CODE, params,(Function, Result>) res->{ + if(res == null){ + return null; + } + return new Result(res); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + + public Result computeAddress(int chainId, Object sender, Object codeHash, Object salt) { + Map params = new HashMap<>(); + params.put(Constants.CHAIN_ID, chainId); + params.put("sender", sender); + params.put("codeHash", codeHash); + params.put("salt", salt); + try { + return callRpc(ModuleE.SC.abbr, COMPUTE_ADDRESS, params,(Function, Result>) res->{ + if(res == null){ + return null; + } + return new Result(res); + }); + } catch (NulsRuntimeException e) { + return Result.fail(e.getCode(), e.getMessage()); + } + } + } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java index 48f8994426..f939442eea 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java @@ -261,8 +261,8 @@ public RpcModuleState onDependenciesReady() { LoggerUtil.logger().error("启动异常退出...."); System.exit(-1); } - CmTaskManager cmTaskManager = SpringLiteContext.getBean(CmTaskManager.class); - cmTaskManager.start(); +// CmTaskManager cmTaskManager = SpringLiteContext.getBean(CmTaskManager.class); +// cmTaskManager.start(); NulsDateUtils.getInstance().start(5 * 60 * 1000); LoggerUtil.logger().info("onDependenciesReady ok...."); return RpcModuleState.Running; diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java index af0356f5c1..6ce2f52d50 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java @@ -85,10 +85,10 @@ public Response assetReg(Map params) { if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { return failed(CmErrorCode.ERROR_ASSET_DECIMALPLACES); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getSymbol())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { return failed(CmErrorCode.ERROR_ASSET_SYMBOL); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getAssetName())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getAssetName())) { return failed(CmErrorCode.ERROR_ASSET_NAME); } @@ -178,10 +178,10 @@ public Response mainNetAssetReg(Map params) { if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { return failed(CmErrorCode.ERROR_ASSET_DECIMALPLACES); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getSymbol())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { return failed(CmErrorCode.ERROR_ASSET_SYMBOL); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getAssetName())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getAssetName())) { return failed(CmErrorCode.ERROR_ASSET_NAME); } int version = ProtocolGroupManager.getCurrentVersion(Integer.valueOf(nulsChainConfig.getMainChainId())); diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java index 44741c389b..185324c74f 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java @@ -167,10 +167,10 @@ public Response chainReg(Map params) { if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { return failed(CmErrorCode.ERROR_ASSET_DECIMALPLACES); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getSymbol())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { return failed(CmErrorCode.ERROR_ASSET_SYMBOL); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getAssetName())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getAssetName())) { return failed(CmErrorCode.ERROR_ASSET_NAME); } @@ -307,10 +307,10 @@ public Response chainActive(Map params) { if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { return failed(CmErrorCode.ERROR_ASSET_DECIMALPLACES); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getSymbol())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { return failed(CmErrorCode.ERROR_ASSET_SYMBOL); } - if (!FormatValidUtils.validTokenNameOrSymbol(asset.getAssetName())) { + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getAssetName())) { return failed(CmErrorCode.ERROR_ASSET_NAME); } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java index 823054994b..95fb0902d0 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java @@ -56,6 +56,9 @@ public interface ValidateService { ChainEventResult batchChainRegValidatorV7(BlockChain blockChain, Asset asset, Map tempChains, Map tempAssets) throws Exception; + ChainEventResult batchChainRegValidatorV15(BlockChain blockChain, Asset asset, Map tempChains, Map tempAssets) throws Exception; + ChainEventResult batchAssetRegValidatorV7(Asset asset, Map tempAssets) throws Exception; ChainEventResult batchAssetRegValidatorV12(Asset asset, Map tempAssets) throws Exception; + ChainEventResult batchAssetRegValidatorV15(Asset asset, Map tempAssets) throws Exception; } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java index 8c373c23c9..0a127ce85f 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java @@ -47,7 +47,7 @@ public class CmTaskManager { private ScheduledThreadPoolExecutor executorService; public void start() { - executorService = ThreadUtils.createScheduledThreadPool(1, new NulsThreadFactory("cmThread")); +// executorService = ThreadUtils.createScheduledThreadPool(1, new NulsThreadFactory("cmThread")); // chainAssetsCirculateUpdate(); } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java index d4e67d55b6..820f83d681 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java @@ -316,7 +316,30 @@ public ChainEventResult batchChainRegValidatorV7(BlockChain blockChain, Asset as // } return ChainEventResult.getResultSuccess(); } - + @Override + public ChainEventResult batchChainRegValidatorV15(BlockChain blockChain, Asset asset, Map tempChains, Map tempAssets) throws Exception { + ChainEventResult chainEventResult = batchChainRegBaseValidator(blockChain, asset, tempChains, tempAssets); + if (!chainEventResult.isSuccess()) { + return chainEventResult; + } + if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DECIMALPLACES); + } + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_SYMBOL); + } + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getAssetName())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_NAME); + } +// //判断黑洞资产与锁定资产 +// if(!BigIntegerUtils.isEqual(asset.getDepositNuls(),nulsChainConfig.getAssetDepositNuls())){ +// return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DEPOSITNULS); +// } +// if(!BigIntegerUtils.isEqual(asset.getDestroyNuls(),nulsChainConfig.getAssetDestroyNuls())){ +// return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DEPOSITNULS); +// } + return ChainEventResult.getResultSuccess(); + } @Override public ChainEventResult batchAssetRegValidatorV7(Asset asset, Map tempAssets) throws Exception { if (assetService.assetExist(asset, tempAssets)) { @@ -361,6 +384,30 @@ public ChainEventResult batchAssetRegValidatorV12(Asset asset, Map tempAssets) throws Exception { + if (assetService.regChainAssetExist(asset, tempAssets)) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_ID_EXIST); + } + if (asset.getDecimalPlaces() < Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMin()) || asset.getDecimalPlaces() > Integer.valueOf(nulsChainConfig.getAssetDecimalPlacesMax())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DECIMALPLACES); + } + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_SYMBOL); + } + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getAssetName())) { + return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_NAME); + } + //判断黑洞资产与锁定资产 +// if (!BigIntegerUtils.isEqual(asset.getDepositNuls(), nulsChainConfig.getAssetDepositNuls())) { +// return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DEPOSITNULS); +// } +// if (!BigIntegerUtils.isEqual(asset.getDestroyNuls(), nulsChainConfig.getAssetDestroyNuls())) { +// return ChainEventResult.getResultFail(CmErrorCode.ERROR_ASSET_DEPOSITNULS); // } return ChainEventResult.getResultSuccess(); } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java new file mode 100644 index 0000000000..3209f03110 --- /dev/null +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java @@ -0,0 +1,109 @@ +package io.nuls.chain.service.tx.v15; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.chain.info.CmRuntimeInfo; +import io.nuls.chain.model.dto.ChainEventResult; +import io.nuls.chain.model.po.Asset; +import io.nuls.chain.rpc.call.RpcService; +import io.nuls.chain.service.*; +import io.nuls.chain.util.LoggerUtil; +import io.nuls.chain.util.TxUtil; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component("AddAssetTxProcessorV15") +public class AddAssetTransferProcessor implements TransactionProcessor { + @Autowired + private ValidateService validateService; + @Autowired + private CacheDataService cacheDataService; + @Autowired + private AssetService assetService; + @Autowired + private ChainService chainService; + @Autowired + private RpcService rpcService; + @Autowired + CmTransferService cmTransferService; + + @Override + public int getType() { + return TxType.ADD_ASSET_TO_CHAIN; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + List errorList = new ArrayList<>(); + Map rtData = new HashMap<>(2); + rtData.put("errorCode", ""); + rtData.put("txList", errorList); + try { + Map assetMap = new HashMap<>(); + Asset asset = null; + ChainEventResult chainEventResult = ChainEventResult.getResultSuccess(); + for (Transaction tx : txs) { + String txHash = tx.getHash().toHex(); + asset = TxUtil.buildAssetWithTxAssetV5(tx); + String assetKey = CmRuntimeInfo.getAssetKey(asset.getChainId(), asset.getAssetId()); + chainEventResult = validateService.batchAssetRegValidatorV15(asset, assetMap); + if (chainEventResult.isSuccess()) { + assetMap.put(assetKey, 1); + LoggerUtil.logger().debug("txHash = {},assetKey={} reg batchValidate success!", txHash, assetKey); + } else { + rtData.put("errorCode", chainEventResult.getErrorCode().getCode()); + LoggerUtil.logger().error("txHash = {},assetKey={} reg batchValidate fail!", txHash, assetKey); + errorList.add(tx); + } + } + } catch (Exception e) { + LoggerUtil.logger().error(e); + throw new RuntimeException(e); + } + return rtData; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + long commitHeight = blockHeader.getHeight(); + List assets = new ArrayList<>(); + Asset asset = null; + try { + for (Transaction tx : txs) { + asset = TxUtil.buildAssetWithTxAssetV5(tx); + assetService.registerAsset(asset); + assets.add(asset); + } + } catch (Exception e) { + LoggerUtil.logger().error(e); + //通知远程调用回滚 + try { + //进行回滚 + cacheDataService.rollBlockTxs(chainId, commitHeight); + } catch (Exception e1) { + LoggerUtil.logger().error(e); + throw new RuntimeException(e); + } + return false; + } + rpcService.registerCrossAsset(assets, blockHeader.getTime()); + return true; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + return cmTransferService.rollbackV3(chainId, txs, blockHeader); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java new file mode 100644 index 0000000000..dba0182eec --- /dev/null +++ b/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java @@ -0,0 +1,135 @@ +package io.nuls.chain.service.tx.v15; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.chain.info.CmRuntimeInfo; +import io.nuls.chain.model.dto.ChainEventResult; +import io.nuls.chain.model.po.Asset; +import io.nuls.chain.model.po.BlockChain; +import io.nuls.chain.rpc.call.RpcService; +import io.nuls.chain.service.CacheDataService; +import io.nuls.chain.service.ChainService; +import io.nuls.chain.service.CmTransferService; +import io.nuls.chain.service.ValidateService; +import io.nuls.chain.util.ChainManagerUtil; +import io.nuls.chain.util.LoggerUtil; +import io.nuls.chain.util.TxUtil; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component("RegChainTxProcessorV15") +public class RegChainTransferProcessor implements TransactionProcessor { + @Autowired + private ValidateService validateService; + @Autowired + private CacheDataService cacheDataService; + @Autowired + private ChainService chainService; + @Autowired + private RpcService rpcService; + @Autowired + CmTransferService cmTransferService; + + @Override + public int getType() { + return TxType.REGISTER_CHAIN_AND_ASSET; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + List errorList = new ArrayList<>(); + Map rtData = new HashMap<>(2); + rtData.put("errorCode", ""); + rtData.put("txList", errorList); + try { + Map chainMap = new HashMap<>(); + Map assetMap = new HashMap<>(); + BlockChain blockChain = null; + Asset asset = null; + ChainEventResult chainEventResult = ChainEventResult.getResultSuccess(); + for (Transaction tx : txs) { + String txHash = tx.getHash().toHex(); + blockChain = TxUtil.buildChainWithTxDataV4(tx, false); + asset = TxUtil.buildAssetWithTxChainV4(tx); + String assetKey = CmRuntimeInfo.getAssetKey(asset.getChainId(), asset.getAssetId()); + chainEventResult = validateService.batchChainRegValidatorV15(blockChain, asset, chainMap, assetMap); + if (chainEventResult.isSuccess()) { + ChainManagerUtil.putChainMap(blockChain, chainMap); + assetMap.put(assetKey, 1); + LoggerUtil.logger().debug("txHash = {},chainId={} reg batchValidate success!", txHash, blockChain.getChainId()); + } else { + rtData.put("errorCode", chainEventResult.getErrorCode().getCode()); + LoggerUtil.logger().error("txHash = {},chainId={},magicNumber={} reg batchValidate fail!", txHash, blockChain.getChainId(), blockChain.getMagicNumber()); + errorList.add(tx); + } + } + } catch (Exception e) { + LoggerUtil.logger().error(e); + throw new RuntimeException(e); + } + return rtData; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + LoggerUtil.logger().debug("reg chain tx count = {}", txs.size()); + long commitHeight = blockHeader.getHeight(); + BlockChain blockChain = null; + Asset asset = null; + List blockChains = new ArrayList<>(); + List> prefixList = new ArrayList<>(); + try { + for (Transaction tx : txs) { + blockChain = TxUtil.buildChainWithTxDataV4(tx, false); + asset = TxUtil.buildAssetWithTxChainV4(tx); + BlockChain dbChain = chainService.getChain(blockChain.getChainId()); + //继承数据 + if (null != dbChain) { + blockChain.setSelfAssetKeyList(TxUtil.moveRepeatInfo(dbChain.getSelfAssetKeyList())); + blockChain.setTotalAssetKeyList(TxUtil.moveRepeatInfo(dbChain.getTotalAssetKeyList())); + } else { + blockChain.addCreateAssetId(CmRuntimeInfo.getAssetKey(blockChain.getChainId(), asset.getAssetId())); + blockChain.addCirculateAssetId(CmRuntimeInfo.getAssetKey(blockChain.getChainId(), asset.getAssetId())); + } + + chainService.registerBlockChain(blockChain, asset); + blockChains.add(blockChain); + Map prefix = new HashMap<>(2); + prefix.put("chainId", blockChain.getChainId()); + prefix.put("addressPrefix", blockChain.getAddressPrefix()); + prefixList.add(prefix); + } + } catch (Exception e) { + LoggerUtil.logger().error(e); + //通知远程调用回滚 + try { + chainService.rpcBlockChainRollback(txs, blockHeader.getTime()); + //进行回滚 + cacheDataService.rollBlockTxs(chainId, commitHeight); + } catch (Exception e1) { + LoggerUtil.logger().error(e); + throw new RuntimeException(e); + } + return false; + } + rpcService.registerCrossChain(blockChains); + rpcService.addAcAddressPrefix(prefixList); + return true; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + return cmTransferService.rollbackV3(chainId, txs, blockHeader); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/module/nuls-chain-manager/src/main/resources/protocol-config.json b/module/nuls-chain-manager/src/main/resources/protocol-config.json index faa6d7d0f0..dca6503477 100644 --- a/module/nuls-chain-manager/src/main/resources/protocol-config.json +++ b/module/nuls-chain-manager/src/main/resources/protocol-config.json @@ -1,4 +1,29 @@ [ + { + "version": "15", + "extend": "12", + "validTxs": [ + { + "type": "11", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "RegChainTxProcessorV15" + }, + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV15" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, { "version": "12", "extend": "7", diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/AssetRegMngService.java b/module/nuls-ledger/src/main/java/io/nuls/ledger/service/AssetRegMngService.java index 42e1aa78cb..926daecaf9 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/AssetRegMngService.java +++ b/module/nuls-ledger/src/main/java/io/nuls/ledger/service/AssetRegMngService.java @@ -45,6 +45,7 @@ public interface AssetRegMngService { int getAndSetAssetIdByTemp(int chainId, int assetSize); ErrorCode batchAssetRegValidator(TxLedgerAsset txLedgerAsset, byte[] address, BigInteger destroyAsset, int chainId); + ErrorCode batchAssetRegValidatorV15(TxLedgerAsset txLedgerAsset, byte[] address, BigInteger destroyAsset, int chainId); ErrorCode commonRegValidator(TxLedgerAsset asset); diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java b/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java index 5a104e9219..389d1a12e0 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java +++ b/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java @@ -150,6 +150,30 @@ public ErrorCode batchAssetRegValidator(TxLedgerAsset txLedgerAsset, byte[] addr return null; } + @Override + public ErrorCode batchAssetRegValidatorV15(TxLedgerAsset txLedgerAsset, byte[] address, BigInteger destroyAsset, int chainId) { + ErrorCode errorCode = commonRegValidatorV15(txLedgerAsset); + if (null != errorCode) { + return errorCode; + } + //判断地址是否为本地chainId地址 + boolean isAddressValidate = (AddressTool.getChainIdByAddress(txLedgerAsset.getAddress()) == chainId); + if (!isAddressValidate) { + return LedgerErrorCode.ERROR_ADDRESS_ERROR; + } + //判断黑洞地址 + if (!Arrays.equals(address, AddressTool.getAddressByPubKeyStr(ledgerConfig.getBlackHolePublicKey(), chainId))) { + LoggerUtil.COMMON_LOG.error("toAddress is not blackHole"); + return LedgerErrorCode.TX_IS_WRONG; + } + long decimal = (long) Math.pow(10, Integer.valueOf(ledgerConfig.getDecimals())); + BigInteger destroyAssetTx = BigInteger.valueOf(ledgerConfig.getAssetRegDestroyAmount()).multiply(BigInteger.valueOf(decimal)); + if (!BigIntegerUtils.isEqual(destroyAsset, destroyAssetTx)) { + LoggerUtil.COMMON_LOG.error("destroyNuls={} is error", destroyAsset); + return LedgerErrorCode.TX_IS_WRONG; + } + return null; + } @Override public ErrorCode commonRegValidator(TxLedgerAsset asset) { if (asset.getDecimalPlace() < LedgerConstant.DECIMAL_PLACES_MIN || asset.getDecimalPlace() > LedgerConstant.DECIMAL_PLACES_MAX) { @@ -164,6 +188,19 @@ public ErrorCode commonRegValidator(TxLedgerAsset asset) { return null; } + public ErrorCode commonRegValidatorV15(TxLedgerAsset asset) { + if (asset.getDecimalPlace() < LedgerConstant.DECIMAL_PLACES_MIN || asset.getDecimalPlace() > LedgerConstant.DECIMAL_PLACES_MAX) { + return LedgerErrorCode.ERROR_ASSET_DECIMALPLACES; + } + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getSymbol())) { + return LedgerErrorCode.ERROR_ASSET_SYMBOL; + } + if (!FormatValidUtils.validTokenNameOrSymbolV15(asset.getName())) { + return LedgerErrorCode.ERROR_ASSET_NAME; + } + return null; + } + @Override public void registerTxAssets(int chainId, List ledgerAssets) throws Exception { Map assets = new HashMap<>(ledgerAssets.size()); diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java b/module/nuls-ledger/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java new file mode 100644 index 0000000000..7587a2a3a3 --- /dev/null +++ b/module/nuls-ledger/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java @@ -0,0 +1,132 @@ +package io.nuls.ledger.service.v15; + +import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.base.data.*; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.core.constant.ErrorCode; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; +import io.nuls.ledger.constant.LedgerConstant; +import io.nuls.ledger.constant.LedgerErrorCode; +import io.nuls.ledger.model.po.LedgerAsset; +import io.nuls.ledger.model.tx.txdata.TxLedgerAsset; +import io.nuls.ledger.service.AssetRegMngService; +import io.nuls.ledger.utils.LoggerUtil; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component("AssetRegTransferProcessorV15") +public class AssetRegTransferProcessor implements TransactionProcessor { + @Autowired + private AssetRegMngService assetRegMngService; + @Override + public int getType() { + return TxType.LEDGER_ASSET_REG_TRANSFER; + } + + private LedgerAsset buildLedgerAssetByTx(Transaction tx, int chainId) throws NulsException { + String txHash = tx.getHash().toHex(); + TxLedgerAsset txLedgerAsset = new TxLedgerAsset(); + txLedgerAsset.parse(tx.getTxData(), 0); + byte[] stream = tx.getCoinData(); + CoinData coinData = new CoinData(); + coinData.parse(new NulsByteBuffer(stream)); + List coinTos = coinData.getTo(); + List coinFroms = coinData.getFrom(); + byte[] fromAddress = null; + BigInteger destroyAsset = coinTos.get(0).getAmount(); + fromAddress = coinFroms.get(0).getAddress(); + LedgerAsset asset = new LedgerAsset(txLedgerAsset, chainId, destroyAsset, txHash, tx.getTime(), fromAddress,LedgerConstant.COMMON_ASSET_TYPE); + return asset; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + List errorList = new ArrayList<>(); + Map rtData = new HashMap<>(2); + rtData.put("errorCode", ""); + rtData.put("txList", errorList); + try { + Map assetMap = new HashMap<>(); + for (Transaction tx : txs) { + String txHash = tx.getHash().toHex(); + TxLedgerAsset txLedgerAsset = new TxLedgerAsset(); + txLedgerAsset.parse(tx.getTxData(), 0); + byte[] stream = tx.getCoinData(); + CoinData coinData = new CoinData(); + coinData.parse(new NulsByteBuffer(stream)); + List coinTos = coinData.getTo(); + List coinFroms = coinData.getFrom(); + BigInteger destroyAsset = BigInteger.ZERO; + byte[] toAddress = null; + byte[] fromAddress = null; + if (coinTos.size() == 1) { + destroyAsset = coinTos.get(0).getAmount(); + toAddress = coinTos.get(0).getAddress(); + } else { + rtData.put("errorCode", LedgerErrorCode.TX_IS_WRONG); + errorList.add(tx); + continue; + } + if (coinFroms.size() == 1) { + fromAddress = coinFroms.get(0).getAddress(); + } else { + rtData.put("errorCode", LedgerErrorCode.TX_IS_WRONG); + errorList.add(tx); + continue; + } + ErrorCode errorCode = assetRegMngService.batchAssetRegValidatorV15(txLedgerAsset, toAddress, destroyAsset, chainId); + if (null == errorCode) { + LoggerUtil.COMMON_LOG.debug("txHash = {},reg batchValidate success!", txHash); + } else { + rtData.put("errorCode", errorCode.getCode()); + LoggerUtil.COMMON_LOG.error("txHash = {},reg batchValidate fail!", txHash); + errorList.add(tx); + } + } + } catch (Exception e) { + LoggerUtil.COMMON_LOG.error(e); + throw new RuntimeException(e); + } + return rtData; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader blockHeader) { + List assets = new ArrayList<>(); + try { + for (Transaction tx : txs) { + LedgerAsset asset = buildLedgerAssetByTx(tx, chainId); + assets.add(asset); + } + assetRegMngService.registerTxAssets(chainId, assets); + } catch (Exception e) { + LoggerUtil.COMMON_LOG.error(e); + //通知远程调用回滚 + return false; + } + return true; + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + List list = new ArrayList<>(); + for (Transaction tx : txs) { + LedgerAsset ledgerAsset = buildLedgerAssetByTx(tx,chainId); + list.add(ledgerAsset); + } + assetRegMngService.rollBackTxAssets(chainId, list); + return true; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} diff --git a/module/nuls-ledger/src/main/resources/protocol-config.json b/module/nuls-ledger/src/main/resources/protocol-config.json index 3b2c052389..3243a7b821 100644 --- a/module/nuls-ledger/src/main/resources/protocol-config.json +++ b/module/nuls-ledger/src/main/resources/protocol-config.json @@ -1,7 +1,7 @@ [ { - "version": "6", - "extend": "1", + "version": "15", + "extend": "6", "validTxs": [ { "type": "27", @@ -9,13 +9,29 @@ "unlockTx": false, "verifySignature": true, "verifyFee": true, - "handler": "AssetRegTransferProcessorV5" + "handler": "AssetRegTransferProcessorV15" } ], "validMsgs": [], "invalidTxs": "", "invalidMsgs": "" - }, + },{ + "version": "6", + "extend": "1", + "validTxs": [ + { + "type": "27", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AssetRegTransferProcessorV5" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" +}, { "version": "1", "extend": "", diff --git a/module/nuls-network/pom.xml b/module/nuls-network/pom.xml index 6adf9c02e0..d1aa46d9ba 100644 --- a/module/nuls-network/pom.xml +++ b/module/nuls-network/pom.xml @@ -20,7 +20,7 @@ io.netty netty-all - 4.1.42.Final + 4.1.72.Final com.google.protobuf @@ -31,7 +31,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.9.9 + 2.13.3 diff --git a/module/nuls-protocol-update/src/main/resources/versions.json b/module/nuls-protocol-update/src/main/resources/versions.json index 362b9b4dc5..595c8e227c 100644 --- a/module/nuls-protocol-update/src/main/resources/versions.json +++ b/module/nuls-protocol-update/src/main/resources/versions.json @@ -68,5 +68,15 @@ "version": "14", "effectiveRatio": "80", "continuousIntervalCount": "10" + }, + { + "version": "15", + "effectiveRatio": "80", + "continuousIntervalCount": "10" + }, + { + "version": "16", + "effectiveRatio": "80", + "continuousIntervalCount": "10" } ] \ No newline at end of file diff --git a/module/nuls-smart-contract/pom.xml b/module/nuls-smart-contract/pom.xml index 2428fbf6ca..b7ecbb589c 100644 --- a/module/nuls-smart-contract/pom.xml +++ b/module/nuls-smart-contract/pom.xml @@ -16,6 +16,13 @@ 1.0.0 + + + nuls-release + nuls-release + https://nexus.nuls.io/repository/nuls-release/ + + io.nuls.v2 @@ -31,7 +38,7 @@ com.google.guava guava - 27.0.1-jre + 31.0.1-jre @@ -60,7 +67,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.9.9 + 2.13.3 com.fasterxml.jackson.core @@ -71,7 +78,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.9.9 + 2.13.3 @@ -130,7 +137,7 @@ io.nuls.v2 sdk4j - 1.1.6.RELEASE + 1.1.7.RELEASE test diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java index 774f414ddc..3ad4d03e62 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java @@ -9,6 +9,7 @@ import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractDBConstant; +import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.model.bo.Chain; import io.nuls.contract.model.bo.ContractTokenAssetsInfo; @@ -64,6 +65,8 @@ public class SmartContractBootStrap extends RpcModule { private ChainManager chainManager; @Autowired private AddressPrefixDatas addressPrefixDatas; + @Autowired + private ContractHelper contractHelper; public static void main(String[] args) throws Exception { systemConfig(); @@ -88,6 +91,7 @@ public void init() { initDB(); initNRC20Standard(); initNRC721Standard(); + initNRC1155Standard(); chainManager.initChain(); ModuleHelper.init(this); } catch (Exception e) { @@ -106,6 +110,7 @@ private void initNulsConfig() { if (StringUtils.isNotBlank(contractConfig.getCrossTokenSystemContract())) { ContractContext.CROSS_CHAIN_SYSTEM_CONTRACT = AddressTool.getAddress(contractConfig.getCrossTokenSystemContract()); } + ContractContext.setContractHelper(contractHelper); } /** @@ -173,11 +178,31 @@ private void initNRC721Standard() { } catch (Exception e) { Log.error("init NRC721Standard map error.", e); } - ProgramMethod overloadMethodSafeData = jsonMap.remove(NRC721_SAFETRANSFERFROM_DATA); - ProgramMethod overloadMethodSafe = jsonMap.remove(NRC721_SAFETRANSFERFROM); VMContext.setNrc721Methods(jsonMap); - VMContext.setNrc721OverloadMethodSafeData(overloadMethodSafeData); - VMContext.setNrc721OverloadMethodSafe(overloadMethodSafe); + } + + /** + * 初始化NRC1155合约标准格式 + */ + private void initNRC1155Standard() { + String json = null; + try { + json = IoUtils.read(NRC1155_STANDARD_FILE); + } catch (Exception e) { + // skip it + Log.error("init NRC1155Standard error.", e); + } + if (json == null) { + return; + } + + Map jsonMap = null; + try { + jsonMap = JSONUtils.json2map(json, ProgramMethod.class); + } catch (Exception e) { + Log.error("init NRC20Standard map error.", e); + } + VMContext.setNrc1155Methods(jsonMap); } /** diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java index 6d6736c77e..2ebe38ec5a 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java @@ -23,8 +23,19 @@ */ package io.nuls.contract.config; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import io.nuls.base.basic.AddressTool; +import io.nuls.contract.enums.TokenTypeStatus; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.model.po.ContractAddressInfoPo; +import io.nuls.core.basic.Result; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; /** * @author: PierreLuo @@ -73,4 +84,53 @@ public class ContractContext { public static short UPDATE_VERSION_ACCOUNT_TRANSFER_ON_CONTRACT_CALL = 13; public static short PROTOCOL_14 = 14; + public static short PROTOCOL_15 = 15; + public static short PROTOCOL_16 = 16; + private static final LoadingCache CONTRACT_INFO_CACHE; + private static ContractHelper contractHelper; + + static { + CONTRACT_INFO_CACHE = CacheBuilder.newBuilder() + .initialCapacity(200) + .maximumSize(200) + .expireAfterAccess(10, TimeUnit.MINUTES) + .build(new CacheLoader() { + @Override + public ContractAddressInfoPo load(String contract) { + Result contractAddressInfoResult = contractHelper.getContractAddressInfo(CHAIN_ID, AddressTool.getAddress(contract)); + ContractAddressInfoPo po = contractAddressInfoResult.getData(); + return po; + } + }); + } + + public static void loadContractAddressInfo(ContractAddressInfoPo info) { + if (info != null) { + CONTRACT_INFO_CACHE.put(AddressTool.getStringAddressByBytes(info.getContractAddress()), info); + } + } + + public static int getTokenType(String contract) { + ContractAddressInfoPo contractAddressInfo = getContractAddressInfo(contract); + if (contractAddressInfo == null) { + return TokenTypeStatus.NOT_TOKEN.status(); + } + return contractAddressInfo.getTokenType(); + } + + public static ContractAddressInfoPo getContractAddressInfo(String contract) { + try { + return CONTRACT_INFO_CACHE.get(contract); + } catch (ExecutionException e) { + return null; + } + } + + public static void setContractHelper(ContractHelper contractHelper) { + if (contractHelper == null) { + return; + } + ContractContext.contractHelper = contractHelper; + } + } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java index 902d346f39..0921220913 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java @@ -74,4 +74,6 @@ public interface ContractCmdConstant { String ACCOUNT_CONTRACTS = "sc_account_contracts"; String GET_CROSS_TOKEN_SYSTEM_CONTRACT = "sc_get_cross_token_system_contract"; String CODE_HASH = "sc_code_hash"; + String CONTRACT_CODE = "sc_contract_code"; + String COMPUTE_ADDRESS = "sc_compute_address"; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java index b5d3d0f5c0..634cfb62ac 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java @@ -98,8 +98,6 @@ public interface ContractConstant { String TO = "to"; String VALUE = "value"; String TOKEN_ID = "tokenId"; - int TOKEN_TYPE_NRC20 = 1; - int TOKEN_TYPE_NRC721 = 2; /** * NRC20 */ @@ -125,6 +123,13 @@ public interface ContractConstant { String NRC721_EVENT_TRANSFER = "Transfer"; String NRC721_EVENT_APPROVAL = "Approval"; + /** + * NRC1155 + */ + String NRC1155_STANDARD_FILE = "nrc1155.json"; + String NRC1155_EVENT_TRANSFER_SINGLE = "TransferSingle"; + String NRC1155_EVENT_TRANSFER_BATCH = "TransferBatch"; + int DEFAULT_MAX_VIEW_GAS = 100000000; String SYS_FILE_ENCODING = "file.encoding"; String MODULE_CONFIG_FILE = "module.json"; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java index a269f7d9a0..90b33d9363 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java @@ -32,10 +32,11 @@ * @date: 2019-08-20 */ public enum TokenTypeStatus { - // 0 - 非token, 1 - NRC20, 2 - NRC721 + // 0 - 非token, 1 - NRC20, 2 - NRC721, 3 - NRC1155 NOT_TOKEN(0), NRC20(1), - NRC721(2); + NRC721(2), + NRC1155(3); private int status; private static Map map; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java index 7dba6f6e49..253b491526 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java @@ -129,7 +129,7 @@ public ContractConstructorInfoDto getConstructor(int chainId, byte[] contractCod break; } } - dto.setNrc20(this.checkNrc20Contract(programMethods)); + dto.setNrc20(this.checkTokenContract(programMethods, null, VMContext.getNrc20Methods().values())); return dto; } catch (Exception e) { Log.error(e); @@ -177,11 +177,7 @@ public ProgramMethod getMethodInfoByContractAddress(int chainId, byte[] currentS return this.getMethodInfo(methodName, methodDesc, methods); } - private boolean checkNrc20Contract(List methods) { - return checkNrc20Contract(methods, null); - } - - private boolean checkNrc20Contract(List methods, Map contractMethodsMap) { + private boolean checkTokenContract(List methods, Map contractMethodsMap, Collection tokenStandardProgramMethods) { if (methods == null || methods.size() == 0) { return false; } @@ -189,22 +185,17 @@ private boolean checkNrc20Contract(List methods, Map(methods.size()); } for (ProgramMethod method : methods) { - contractMethodsMap.put(method.getName(), method); + contractMethodsMap.put(methodSignature(method), method); } - Set> entries = VMContext.getNrc20Methods().entrySet(); - String methodName; - ProgramMethod standardMethod; ProgramMethod mappingMethod; - for (Map.Entry entry : entries) { - methodName = entry.getKey(); - standardMethod = entry.getValue(); - mappingMethod = contractMethodsMap.get(methodName); + for (ProgramMethod standardMethod : tokenStandardProgramMethods) { + mappingMethod = contractMethodsMap.get(methodSignature(standardMethod)); if (mappingMethod == null) { return false; } - if (!standardMethod.equalsNrc20Method(mappingMethod)) { + if (!standardMethod.equalsTokenMethod(mappingMethod)) { return false; } } @@ -212,51 +203,6 @@ private boolean checkNrc20Contract(List methods, Map methods, Map contractMethodsMap) { - if (methods == null || methods.size() == 0) { - return false; - } - - Set> entries = VMContext.getNrc721Methods().entrySet(); - String methodName; - ProgramMethod standardMethod; - ProgramMethod mappingMethod; - for (Map.Entry entry : entries) { - methodName = entry.getKey(); - standardMethod = entry.getValue(); - mappingMethod = contractMethodsMap.get(methodName); - - if (mappingMethod == null) { - return false; - } - if (!standardMethod.equalsNrc721Method(mappingMethod)) { - return false; - } - } - boolean hasSafe = false; - boolean hasSafeData = false; - for (ProgramMethod method : methods) { - if (NRC721_SAFETRANSFERFROM.equals(method.getName())) { - int size = method.getArgs().size(); - if (size == 3 && VMContext.getNrc721OverloadMethodSafe().equalsNrc721Method(method)) { - hasSafe = true; - continue; - } - if (size == 4 && VMContext.getNrc721OverloadMethodSafeData().equalsNrc721Method(method)) { - hasSafeData = true; - continue; - } - } - if (hasSafe && hasSafeData) { - break; - } - } - if (hasSafe && hasSafeData) { - return true; - } - return false; - } - private boolean checkAcceptDirectTransfer(List methods) { if (methods == null || methods.size() == 0) { return false; @@ -397,16 +343,26 @@ private boolean validTokenNameOrSymbol(int chainId, String name) { } public Result validateNrc20Contract(int chainId, ProgramExecutor track, byte[] contractAddress, byte[] contractCode, ContractResult contractResult) { + if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.PROTOCOL_16) { + return validateNrc20ContractP16(chainId, track, contractAddress, contractCode, contractResult); + } else if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.PROTOCOL_15) { + return validateNrc20ContractP15(chainId, track, contractAddress, contractCode, contractResult); + } else { + return validateNrc20ContractP0(chainId, track, contractAddress, contractCode, contractResult); + } + } + + private Result validateNrc20ContractP0(int chainId, ProgramExecutor track, byte[] contractAddress, byte[] contractCode, ContractResult contractResult) { if (contractResult == null) { return Result.getFailed(ContractErrorCode.NULL_PARAMETER); } long bestBlockHeight = vmContext.getBestHeight(chainId); List methods = this.getAllMethods(chainId, contractCode); Map contractMethodsMap = new HashMap<>(); - boolean isNrc20 = this.checkNrc20Contract(methods, contractMethodsMap); + boolean isNrc20 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc20Methods().values()); boolean isNrc721 = false; if (!isNrc20) { - isNrc721 = this.checkNrc721Contract(methods, contractMethodsMap); + isNrc721 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc721Methods().values()); } if (isNrc20) { contractResult.setTokenType(TokenTypeStatus.NRC20.status()); @@ -487,6 +443,194 @@ public Result validateNrc20Contract(int chainId, ProgramExecutor track, byte[] c return getSuccess(); } + private Result validateNrc20ContractP15(int chainId, ProgramExecutor track, byte[] contractAddress, byte[] contractCode, ContractResult contractResult) { + if (contractResult == null) { + return Result.getFailed(ContractErrorCode.NULL_PARAMETER); + } + long bestBlockHeight = vmContext.getBestHeight(chainId); + List methods = this.getAllMethods(chainId, contractCode); + Map contractMethodsMap = new HashMap<>(); + boolean isNrc20 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc20Methods().values()); + boolean isNrc721 = false; + if (!isNrc20) { + isNrc721 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc721Methods().values()); + } + if (isNrc20) { + contractResult.setTokenType(TokenTypeStatus.NRC20.status()); + } else if (isNrc721) { + contractResult.setTokenType(TokenTypeStatus.NRC721.status()); + } + boolean isAcceptDirectTransfer = this.checkAcceptDirectTransfer(methods); + contractResult.setNrc20(isNrc20); + contractResult.setAcceptDirectTransfer(isAcceptDirectTransfer); + if (isNrc20 || isNrc721) { + // NRC20 tokenName 验证代币名称格式 + ProgramResult programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_NAME, null, null); + if (programResult.isSuccess()) { + String tokenName = programResult.getResult(); + if (StringUtils.isNotBlank(tokenName)) { + if (!validTokenNameOrSymbol(chainId, tokenName)) { + contractResult.setError(true); + contractResult.setErrorMessage("The format of the name is incorrect."); + return getFailed(); + } + contractResult.setTokenName(tokenName); + } + } + // NRC20 tokenSymbol 验证代币符号的格式 + programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_SYMBOL, null, null); + if (programResult.isSuccess()) { + String symbol = programResult.getResult(); + if (StringUtils.isNotBlank(symbol)) { + if (!validTokenNameOrSymbol(chainId, symbol)) { + contractResult.setError(true); + contractResult.setErrorMessage("The format of the symbol is incorrect."); + return getFailed(); + } + contractResult.setTokenSymbol(symbol); + } + } + + if (isNrc20) { + programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_DECIMALS, null, null); + BigInteger decimalsBig = BigInteger.ZERO; + if (programResult.isSuccess()) { + String decimals = programResult.getResult(); + if (StringUtils.isNotBlank(decimals)) { + try { + decimalsBig = new BigInteger(decimals); + if (decimalsBig.compareTo(BigInteger.ZERO) < 0 || decimalsBig.compareTo(MAXIMUM_DECIMALS) > 0) { + contractResult.setError(true); + contractResult.setErrorMessage("The value of decimals ranges from 0 to 18."); + return getFailed(); + } + contractResult.setTokenDecimals(decimalsBig.intValue()); + } catch (Exception e) { + Log.error("Get nrc20 decimals error.", e); + // skip it + } + } + } + programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_TOTAL_SUPPLY, null, null); + if (programResult.isSuccess()) { + String totalSupply = programResult.getResult(); + if (StringUtils.isNotBlank(totalSupply)) { + try { + BigInteger totalSupplyBig = new BigInteger(totalSupply); + if (totalSupplyBig.compareTo(BigInteger.ZERO) < 0 || totalSupplyBig.compareTo(MAXIMUM_TOTAL_SUPPLY.multiply(BigInteger.TEN.pow(decimalsBig.intValue()))) > 0) { + contractResult.setErrorMessage("The value of totalSupply ranges from 0 to 2^256 - 1."); + contractResult.setError(true); + return getFailed(); + } + contractResult.setTokenTotalSupply(totalSupplyBig); + } catch (Exception e) { + Log.error("Get nrc20 totalSupply error.", e); + // skip it + } + } + } + } + } + return getSuccess(); + } + + private Result validateNrc20ContractP16(int chainId, ProgramExecutor track, byte[] contractAddress, byte[] contractCode, ContractResult contractResult) { + if (contractResult == null) { + return Result.getFailed(ContractErrorCode.NULL_PARAMETER); + } + long bestBlockHeight = vmContext.getBestHeight(chainId); + List methods = this.getAllMethods(chainId, contractCode); + Map contractMethodsMap = new HashMap<>(); + boolean isNrc20 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc20Methods().values()); + boolean isNrc721 = false; + boolean isNrc1155 = false; + if (!isNrc20) { + isNrc721 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc721Methods().values()); + } + if (!isNrc721) { + isNrc1155 = this.checkTokenContract(methods, contractMethodsMap, VMContext.getNrc1155Methods().values()); + } + if (isNrc20) { + contractResult.setTokenType(TokenTypeStatus.NRC20.status()); + } else if (isNrc721) { + contractResult.setTokenType(TokenTypeStatus.NRC721.status()); + } else if (isNrc1155) { + contractResult.setTokenType(TokenTypeStatus.NRC1155.status()); + } + boolean isAcceptDirectTransfer = this.checkAcceptDirectTransfer(methods); + contractResult.setNrc20(isNrc20); + contractResult.setAcceptDirectTransfer(isAcceptDirectTransfer); + if (isNrc20 || isNrc721 || isNrc1155) { + // tokenName 验证代币名称格式 + ProgramResult programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_NAME, null, null); + if (programResult.isSuccess()) { + String tokenName = programResult.getResult(); + if (StringUtils.isNotBlank(tokenName)) { + if (!validTokenNameOrSymbol(chainId, tokenName)) { + contractResult.setError(true); + contractResult.setErrorMessage("The format of the name is incorrect."); + return getFailed(); + } + contractResult.setTokenName(tokenName); + } + } + // tokenSymbol 验证代币符号的格式 + programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_SYMBOL, null, null); + if (programResult.isSuccess()) { + String symbol = programResult.getResult(); + if (StringUtils.isNotBlank(symbol)) { + if (!validTokenNameOrSymbol(chainId, symbol)) { + contractResult.setError(true); + contractResult.setErrorMessage("The format of the symbol is incorrect."); + return getFailed(); + } + contractResult.setTokenSymbol(symbol); + } + } + + if (isNrc20) { + programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_DECIMALS, null, null); + BigInteger decimalsBig = BigInteger.ZERO; + if (programResult.isSuccess()) { + String decimals = programResult.getResult(); + if (StringUtils.isNotBlank(decimals)) { + try { + decimalsBig = new BigInteger(decimals); + if (decimalsBig.compareTo(BigInteger.ZERO) < 0 || decimalsBig.compareTo(MAXIMUM_DECIMALS) > 0) { + contractResult.setError(true); + contractResult.setErrorMessage("The value of decimals ranges from 0 to 18."); + return getFailed(); + } + contractResult.setTokenDecimals(decimalsBig.intValue()); + } catch (Exception e) { + Log.error("Get nrc20 decimals error.", e); + // skip it + } + } + } + programResult = this.invokeViewMethod(chainId, track, null, bestBlockHeight, contractAddress, NRC20_METHOD_TOTAL_SUPPLY, null, null); + if (programResult.isSuccess()) { + String totalSupply = programResult.getResult(); + if (StringUtils.isNotBlank(totalSupply)) { + try { + BigInteger totalSupplyBig = new BigInteger(totalSupply); + if (totalSupplyBig.compareTo(BigInteger.ZERO) < 0 || totalSupplyBig.compareTo(MAXIMUM_TOTAL_SUPPLY.multiply(BigInteger.TEN.pow(decimalsBig.intValue()))) > 0) { + contractResult.setErrorMessage("The value of totalSupply ranges from 0 to 2^256 - 1."); + contractResult.setError(true); + return getFailed(); + } + contractResult.setTokenTotalSupply(totalSupplyBig); + } catch (Exception e) { + Log.error("Get nrc20 totalSupply error.", e); + // skip it + } + } + } + } + } + return getSuccess(); + } + public ContractBalance getBalance(int chainId, int assetChainId, int assetId, byte[] address) { ContractTempBalanceManager tempBalanceManager; if (ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_CONTRACT_BALANCE) { @@ -920,14 +1064,13 @@ public Result onCommitForCreateV14(int chainId, BlockHeader blockHeader, Contrac info.setCreateTime(txTime); info.setBlockHeight(blockHeight); - boolean isNrc20Contract = TOKEN_TYPE_NRC20 == contractCreate.getTokenType(); - boolean isNrc721Contract = TOKEN_TYPE_NRC721 == contractCreate.getTokenType(); + boolean isNrc20Contract = TokenTypeStatus.NRC20.status() == contractCreate.getTokenType(); boolean acceptDirectTransfer = contractCreate.isAcceptDirectTransfer(); info.setAcceptDirectTransfer(acceptDirectTransfer); info.setNrc20(isNrc20Contract); info.setTokenType(contractCreate.getTokenType()); do { - if (!isNrc20Contract && !isNrc721Contract) { + if (contractCreate.getTokenType() == TokenTypeStatus.NOT_TOKEN.status()) { break; } // 获取 token tracker @@ -999,4 +1142,13 @@ public Result onRollbackForCreateV14(int chainId, byte[] contractAddress, boolea } return contractTokenAddressStorageService.deleteTokenAddress(chainId, contractAddress); } + + public Result onCommitForCreateV16(int chainId, BlockHeader blockHeader, ContractCreate contractCreate, + NulsHash hash, long txTime, byte[] contractAddress, byte[] sender, byte[] contractCode, String alias, Map infoPoMap) throws Exception { + return this.onCommitForCreateV14(chainId, blockHeader, contractCreate, hash, txTime, contractAddress, sender, contractCode, alias, infoPoMap); + } + + public Result onRollbackForCreateV16(int chainId, byte[] contractAddress, boolean isNrc20) throws Exception { + return this.onRollbackForCreateV14(chainId, contractAddress, isNrc20); + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java index b761fce6cf..db9342ae9a 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java @@ -29,7 +29,7 @@ // add by pierre at 2022/6/1 p14 public class ContractCreate { private boolean acceptDirectTransfer; - // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 + // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721, 3 - NRC1155 private int tokenType; private String tokenName; private String tokenSymbol; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java index d220aba159..f81639b9a1 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java @@ -75,7 +75,7 @@ public class ContractResult { private String errorMessage; private String stackTrace; private boolean acceptDirectTransfer; - // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 + // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721, 3 - NRC1155 private int tokenType; private boolean isNrc20; private String tokenName; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java index e70722edb1..5f15d7e66b 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java @@ -53,7 +53,7 @@ public class ContractInfoDto { private boolean directPayable; @ApiModelProperty(description = "是否接受其他资产直接转账") private boolean directPayableByOtherAsset; - @ApiModelProperty(description = "token类型, 0 - 非token, 1 - NRC20, 2 - NRC721") + @ApiModelProperty(description = "token类型, 0 - 非token, 1 - NRC20, 2 - NRC721, 3 - NRC1155") private int tokenType; @ApiModelProperty(description = "是否是NRC20合约") private boolean nrc20; @@ -69,6 +69,18 @@ public class ContractInfoDto { private String status; @ApiModelProperty(description = "合约方法列表", type = @TypeDescriptor(value = List.class, collectionElement = ProgramMethod.class)) private List method; + @ApiModelProperty(description = "tokenUri") + private String tokenUri; + @ApiModelProperty(description = "codeHash") + private String codeHash; + + public String getTokenUri() { + return tokenUri; + } + + public void setTokenUri(String tokenUri) { + this.tokenUri = tokenUri; + } public int getTokenType() { return tokenType; @@ -197,4 +209,12 @@ public List getMethod() { public void setMethod(List method) { this.method = method; } + + public String getCodeHash() { + return codeHash; + } + + public void setCodeHash(String codeHash) { + this.codeHash = codeHash; + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java index 81a442bddb..5b7eabdfbe 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java @@ -25,6 +25,7 @@ import io.nuls.base.basic.AddressTool; import io.nuls.contract.enums.CmdRegisterMode; +import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.model.bo.ContractInternalCreate; import io.nuls.contract.model.bo.ContractMergedTransfer; import io.nuls.contract.model.bo.ContractMultyAssetMergedTransfer; @@ -47,8 +48,6 @@ import java.util.List; import java.util.stream.Collectors; -import static io.nuls.contract.constant.ContractConstant.TOKEN_TYPE_NRC20; -import static io.nuls.contract.constant.ContractConstant.TOKEN_TYPE_NRC721; import static io.nuls.contract.util.ContractUtil.bigInteger2String; /** @@ -94,6 +93,8 @@ public class ContractResultDto { private List tokenTransfers; @ApiModelProperty(description = "合约NRC721-token转账列表", type = @TypeDescriptor(value = List.class, collectionElement = ContractToken721TransferDto.class)) private List token721Transfers; + @ApiModelProperty(description = "合约NRC1155-token转账列表", type = @TypeDescriptor(value = List.class, collectionElement = ContractToken1155TransferDto.class)) + private List token1155Transfers; @ApiModelProperty(description = "合约调用外部命令的调用记录列表", type = @TypeDescriptor(value = List.class, collectionElement = ContractInvokeRegisterCmdDto.class)) private List invokeRegisterCmds; @ApiModelProperty(description = "合约生成交易的序列化字符串列表", type = @TypeDescriptor(value = List.class, collectionElement = String.class)) @@ -217,21 +218,25 @@ public void setToken721Transfers(List token721Trans private void makeTokenTransfers(int chainId, List tokenTransferEvents) { List result = new ArrayList<>(); List result721 = new ArrayList<>(); + List result1155 = new ArrayList<>(); if (tokenTransferEvents != null && tokenTransferEvents.size() > 0) { ContractTokenTransferInfo info; for (String event : tokenTransferEvents) { info = ContractUtil.convertJsonToTokenTransferInfo(chainId, event); if (info != null) { - if (TOKEN_TYPE_NRC20 == info.getTokenType()) { + if (TokenTypeStatus.NRC20.status() == info.getTokenType()) { result.add(new ContractTokenTransferDto(info)); - } else if (TOKEN_TYPE_NRC721 == info.getTokenType()) { + } else if (TokenTypeStatus.NRC721.status() == info.getTokenType()) { result721.add(new ContractToken721TransferDto(info)); + } else if (TokenTypeStatus.NRC1155.status() == info.getTokenType()) { + result1155.add(new ContractToken1155TransferDto(info)); } } } } this.tokenTransfers = result; this.token721Transfers = result721; + this.token1155Transfers = result1155; } public List getTransfers() { @@ -420,4 +425,12 @@ public List getInternalCreates() { public void setInternalCreates(List internalCreates) { this.internalCreates = internalCreates; } + + public List getToken1155Transfers() { + return token1155Transfers == null ? new ArrayList<>() : token1155Transfers; + } + + public void setToken1155Transfers(List token1155Transfers) { + this.token1155Transfers = token1155Transfers; + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java new file mode 100644 index 0000000000..63114ef50a --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java @@ -0,0 +1,131 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.contract.model.dto; + + +import io.nuls.core.rpc.model.ApiModel; +import io.nuls.core.rpc.model.ApiModelProperty; + +/** + * @author: PierreLuo + */ +@ApiModel +public class ContractToken1155TransferDto { + @ApiModelProperty(description = "合约地址") + private String contractAddress; + @ApiModelProperty(description = "操作方") + private String operator; + @ApiModelProperty(description = "付款方") + private String from; + @ApiModelProperty(description = "收款方") + private String to; + @ApiModelProperty(description = "tokenId") + private String[] ids; + @ApiModelProperty(description = "转账数量") + private String[] values; + @ApiModelProperty(description = "token名称") + private String name; + @ApiModelProperty(description = "token符号") + private String symbol; + + public ContractToken1155TransferDto(ContractTokenTransferInfo info) { + this.contractAddress = info.getContractAddress(); + this.operator = info.getOperator(); + this.from = info.getFrom(); + this.to = info.getTo(); + this.name = info.getName(); + this.symbol = info.getSymbol(); + if (info.getIds() != null) { + this.ids = info.getIds(); + this.values = info.getValues(); + } else { + this.ids = new String[]{info.getId().toString()}; + this.values = new String[]{info.getValue().toString()}; + } + } + + public String getContractAddress() { + return contractAddress; + } + + public void setContractAddress(String contractAddress) { + this.contractAddress = contractAddress; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String[] getIds() { + return ids; + } + + public void setIds(String[] ids) { + this.ids = ids; + } + + public String[] getValues() { + return values; + } + + public void setValues(String[] values) { + this.values = values; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSymbol() { + return symbol; + } + + public void setSymbol(String symbol) { + this.symbol = symbol; + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java index f10d6e76a6..2c5612d780 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java @@ -24,8 +24,6 @@ package io.nuls.contract.model.dto; -import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.util.ContractUtil; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; @@ -51,12 +49,9 @@ public ContractToken721TransferDto(ContractTokenTransferInfo info) { this.contractAddress = info.getContractAddress(); this.from = info.getFrom(); this.to = info.getTo(); - this.tokenId = ContractUtil.bigInteger2String(info.getValue()); - } - - public void setNrc721Info(ContractAddressInfoPo po) { - this.name = po.getNrc20TokenName(); - this.symbol = po.getNrc20TokenSymbol(); + this.tokenId = info.getValue(); + this.name = info.getName(); + this.symbol = info.getSymbol(); } public String getContractAddress() { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java index 1215952165..4631075b62 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java @@ -25,7 +25,6 @@ import io.nuls.base.basic.AddressTool; -import io.nuls.contract.model.po.ContractAddressInfoPo; import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.util.ContractUtil; import io.nuls.core.rpc.model.ApiModel; @@ -69,13 +68,11 @@ public ContractTokenTransferDto(ContractTokenTransferInfo info) { this.contractAddress = info.getContractAddress(); this.from = info.getFrom(); this.to = info.getTo(); - this.value = ContractUtil.bigInteger2String(info.getValue()); - } + this.value = info.getValue(); + this.name = info.getName(); + this.symbol = info.getSymbol(); + this.decimals = info.getDecimals(); - public void setNrc20Info(ContractAddressInfoPo po) { - this.name = po.getNrc20TokenName(); - this.symbol = po.getNrc20TokenSymbol(); - this.decimals = po.getDecimals(); } public String getContractAddress() { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java index 362b5985a3..71bcf38c37 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java @@ -36,10 +36,17 @@ public class ContractTokenTransferInfo implements Serializable { private String from; private String to; - private BigInteger value; + private String value; private String contractAddress; - // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721 + // token类型, 0 - 非token, 1 - NRC20, 2 - NRC721, 3 - NRC1155 private int tokenType; + private String name; + private String symbol; + private long decimals; + private String operator; + private String id; + private String[] ids; + private String[] values; public String getFrom() { return from; @@ -57,14 +64,6 @@ public void setTo(String to) { this.to = to; } - public BigInteger getValue() { - return value; - } - - public void setValue(BigInteger value) { - this.value = value; - } - public String getContractAddress() { return contractAddress; } @@ -80,4 +79,68 @@ public int getTokenType() { public void setTokenType(int tokenType) { this.tokenType = tokenType; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSymbol() { + return symbol; + } + + public void setSymbol(String symbol) { + this.symbol = symbol; + } + + public long getDecimals() { + return decimals; + } + + public void setDecimals(long decimals) { + this.decimals = decimals; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String[] getIds() { + return ids; + } + + public void setIds(String[] ids) { + this.ids = ids; + } + + public String[] getValues() { + return values; + } + + public void setValues(String[] values) { + this.values = values; + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java index 0db551b8ca..99b98693f6 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java @@ -26,8 +26,7 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; -import io.nuls.contract.constant.ContractConstant; -import io.nuls.contract.constant.ContractErrorCode; +import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.model.bo.ContractInternalCreate; import io.nuls.contract.model.bo.ContractResult; @@ -43,7 +42,6 @@ import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.vm.program.ProgramStatus; -import io.nuls.contract.vm.util.JsonUtils; import io.nuls.core.basic.Result; import io.nuls.core.basic.VarInt; import io.nuls.core.core.annotation.Autowired; @@ -314,7 +312,7 @@ public Result onRollbackV14(int chainId, ContractWrapperTransaction tx) { List internalCreates = contractResult.getInternalCreates(); if (internalCreates != null && !internalCreates.isEmpty()) { for (ContractInternalCreate internalCreate : internalCreates) { - Result result = contractHelper.onRollbackForCreateV14(chainId, internalCreate.getContractAddress(), internalCreate.getTokenType() == ContractConstant.TOKEN_TYPE_NRC20); + Result result = contractHelper.onRollbackForCreateV14(chainId, internalCreate.getContractAddress(), internalCreate.getTokenType() == TokenTypeStatus.NRC20.status()); if (result.isFailed()) { return result; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java index 2a9c5ceb76..8e30516a5b 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java @@ -30,6 +30,7 @@ import io.nuls.base.protocol.ProtocolGroupManager; import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractConstant; +import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.model.bo.*; import io.nuls.contract.model.dto.ContractResultDto; @@ -238,7 +239,7 @@ public Result onCommitV8(int chainId, ContractWrapperTransaction tx) throws Exce info.setBlockHeight(blockHeight); boolean isNrc20Contract = contractResult.isNrc20(); - boolean isNrc721Contract = ContractConstant.TOKEN_TYPE_NRC721 == contractResult.getTokenType(); + boolean isNrc721Contract = TokenTypeStatus.NRC721.status() == contractResult.getTokenType(); boolean acceptDirectTransfer = contractResult.isAcceptDirectTransfer(); info.setAcceptDirectTransfer(acceptDirectTransfer); info.setNrc20(isNrc20Contract); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java index d891e90591..428faab1fe 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java @@ -23,7 +23,7 @@ */ package io.nuls.contract.rpc.call; -import io.nuls.contract.model.bo.Chain; +import io.nuls.contract.rpc.CallHelper; import io.nuls.core.exception.NulsException; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; @@ -53,4 +53,25 @@ public static boolean isCrossAssets(int chainId, int assetId) throws NulsExcepti throw new NulsException(e); } } + + public static int getCrossAssetsDecimals(int chainId, int assetId) { + Map params = new HashMap(4); + params.put(Constants.CHAIN_ID, chainId); + params.put("assetId", assetId); + try { + Response callResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CM.abbr, "cm_asset", params); + if (!callResp.isSuccess()) { + return 0; + } + Map resData = (Map) callResp.getResponseData(); + Map resultMap = (Map) resData.get("cm_asset"); + Object decimalPlaces = resultMap.get("decimalPlaces"); + if (decimalPlaces == null) { + return 0; + } + return Integer.parseInt(decimalPlaces.toString()); + } catch (Exception e) { + return 0; + } + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java index 4aa311d2f6..5670a90be3 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java @@ -24,12 +24,14 @@ package io.nuls.contract.rpc.resource; import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.Address; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractErrorCode; import io.nuls.contract.enums.ContractStatus; +import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.manager.ContractTokenBalanceManager; @@ -50,15 +52,19 @@ import io.nuls.contract.util.Log; import io.nuls.contract.util.MapUtil; import io.nuls.contract.vm.program.*; +import io.nuls.contract.vm.util.Utils; import io.nuls.core.basic.Page; import io.nuls.core.basic.Result; +import io.nuls.core.constant.BaseConstant; import io.nuls.core.constant.TxStatusEnum; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; +import io.nuls.core.crypto.KeccakHash; import io.nuls.core.exception.NulsException; import io.nuls.core.model.FormatValidUtils; import io.nuls.core.model.StringUtils; +import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.*; @@ -169,12 +175,14 @@ public Response create(Map params) { @Parameter(parameterName = "args", requestType = @TypeDescriptor(value = Object[].class), parameterDes = "参数列表", canNull = true) }) @ResponseData(name = "返回值", description = "返回消耗的gas值", responseType = @TypeDescriptor(value = Map.class, mapKeys = { - @Key(name = "gasLimit", valueType = Long.class, description = "消耗的gas值，执行失败返回数值1") + @Key(name = "gasLimit", valueType = Long.class, description = "消耗的gas值，执行失败返回数值1"), + @Key(name = "errorMsg", valueType = String.class, description = "执行失败的错误信息") })) public Response imputedCreateGas(Map params) { try { Map resultMap = MapUtil.createHashMap(1); resultMap.put("gasLimit", 1); + String errorMsg = null; boolean isImputed = false; Result result = null; do { @@ -199,6 +207,7 @@ public Response imputedCreateGas(Map params) { } result = contractTxService.validateContractCreateTx(chainId, senderBytes, MAX_GASLIMIT, CONTRACT_MINIMUM_PRICE, contractCodeBytes, convertArgs); if (result.isFailed()) { + errorMsg = result.getMsg(); break; } isImputed = true; @@ -210,6 +219,8 @@ public Response imputedCreateGas(Map params) { gasUsed += gasUsed >> 1; gasUsed = gasUsed > MAX_GASLIMIT ? MAX_GASLIMIT : gasUsed; resultMap.put("gasLimit", gasUsed); + } else if (StringUtils.isNotBlank(errorMsg)) { + resultMap.put("errorMsg", errorMsg); } return success(resultMap); @@ -576,7 +587,7 @@ public Response previewCall(Map params) { } ContractResult contractResult = result.getData(); ContractResultDto contractResultDto = new ContractResultDto(chainId, contractResult, gasLimit); - this.filterRealTokenTransfers(chainId, contractResultDto); + //this.filterRealTokenTransfers(chainId, contractResultDto); return success(contractResultDto); } catch (Exception e) { Log.error(e); @@ -596,12 +607,14 @@ public Response previewCall(Map params) { @Parameter(parameterName = "args", requestType = @TypeDescriptor(value = Object[].class), parameterDes = "参数列表", canNull = true) }) @ResponseData(name = "返回值", description = "返回消耗的gas值", responseType = @TypeDescriptor(value = Map.class, mapKeys = { - @Key(name = "gasLimit", valueType = Long.class, description = "消耗的gas值，执行失败返回数值1") + @Key(name = "gasLimit", valueType = Long.class, description = "消耗的gas值，执行失败返回数值1"), + @Key(name = "errorMsg", valueType = String.class, description = "执行失败的错误信息") })) public Response imputedCallGas(Map params) { try { Map resultMap = MapUtil.createHashMap(1); resultMap.put("gasLimit", 1); + String errorMsg = null; boolean isImputed = false; Result result = null; do { @@ -655,6 +668,7 @@ public Response imputedCallGas(Map params) { result = contractTxService.validateContractCallTx(chainId, senderBytes, value, MAX_GASLIMIT, CONTRACT_MINIMUM_PRICE, contractAddressBytes, methodName, methodDesc, convertArgs, multyAssetValueList); if (result.isFailed()) { + errorMsg = result.getMsg(); break; } isImputed = true; @@ -667,6 +681,8 @@ public Response imputedCallGas(Map params) { gasUsed += gasUsed >> 1; gasUsed = gasUsed > MAX_GASLIMIT ? MAX_GASLIMIT : gasUsed; resultMap.put("gasLimit", gasUsed); + } else if (StringUtils.isNotBlank(errorMsg)) { + resultMap.put("errorMsg", errorMsg); } return success(resultMap); @@ -1048,6 +1064,88 @@ public Response codeHash(Map params) { } } + @CmdAnnotation(cmd = CONTRACT_CODE, version = 1.0, description = "get code of contract") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "contractAddress", parameterDes = "合约地址"), + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "result", description = "code") + })) + public Response contractCode(Map params) { + try { + Integer chainId = (Integer) params.get("chainId"); + ChainManager.chainHandle(chainId); + String contractAddress = (String) params.get("contractAddress"); + + if (!AddressTool.validAddress(chainId, contractAddress)) { + return failed(ADDRESS_ERROR); + } + byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); + if (!ContractLedgerUtil.isExistContractAddress(chainId, contractAddressBytes)) { + return failed(CONTRACT_ADDRESS_NOT_EXIST); + } + BlockHeader blockHeader = BlockCall.getLatestBlockHeader(chainId); + // 当前区块状态根 + byte[] prevStateRoot = ContractUtil.getStateRoot(blockHeader); + byte[] code = contractHelper.getContractCode(chainId, prevStateRoot, contractAddressBytes); + if (code == null) { + Result result = Result.getFailed(ContractErrorCode.DATA_NOT_FOUND); + return wrapperFailed(result); + } else { + Map resultMap = MapUtil.createLinkedHashMap(2); + resultMap.put("result", HexUtil.encode(code)); + return success(resultMap); + } + } catch (Exception e) { + Log.error(e); + return failed(e.getMessage()); + } + } + + @CmdAnnotation(cmd = COMPUTE_ADDRESS, version = 1.0, description = "compute contract") + @Parameters(value = { + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), + @Parameter(parameterName = "sender", parameterDes = "sender"), + @Parameter(parameterName = "codeHash", parameterDes = "codeHash"), + @Parameter(parameterName = "salt", parameterDes = "salt") + }) + @ResponseData(name = "返回值", description = "返回Map", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "contractAddress", description = "合约地址") + })) + public Response computeAddress(Map params) { + try { + Integer chainId = (Integer) params.get("chainId"); + ChainManager.chainHandle(chainId); + String sender = (String) params.get("sender"); + String codeHash = (String) params.get("codeHash"); + List saltList = (List) params.get("salt"); + if (saltList == null || saltList.isEmpty()) { + return failed(PARAMETER_ERROR); + } + int size = saltList.size(); + String[] salts = new String[size]; + for (int i=0;i resultMap = MapUtil.createLinkedHashMap(2); + resultMap.put("contractAddress", newAddress.toString()); + return success(resultMap); + } catch (Exception e) { + Log.error(e); + return failed(e.getMessage()); + } + } + @CmdAnnotation(cmd = CONSTRUCTOR, version = 1.0, description = "contract code constructor") @Parameters(description = "参数", value = { @@ -1113,6 +1211,7 @@ public Response contractInfo(Map params) { byte[] prevStateRoot = ContractUtil.getStateRoot(blockHeader); ProgramExecutor track = contractHelper.getProgramExecutor(chainId).begin(prevStateRoot); + byte[] codeHash = track.contractCodeHash(contractAddressBytes); ProgramStatus status = track.status(contractAddressBytes); List methods = track.method(contractAddressBytes); boolean isAcceptDirectTransferByOtherAsset = false; @@ -1153,19 +1252,25 @@ public Response contractInfo(Map params) { dto.setBlockHeight(po.getBlockHeight()); dto.setTokenType(po.getTokenType()); dto.setNrc20(po.isNrc20()); - boolean isNrc721 = ContractConstant.TOKEN_TYPE_NRC721 == po.getTokenType(); - if (po.isNrc20() || isNrc721) { + boolean isNrc721 = TokenTypeStatus.NRC721.status() == po.getTokenType(); + boolean isNrc1155 = TokenTypeStatus.NRC1155.status() == po.getTokenType(); + if (po.isNrc20() || isNrc721 || isNrc1155) { dto.setNrc20TokenName(po.getNrc20TokenName()); dto.setNrc20TokenSymbol(po.getNrc20TokenSymbol()); if (po.isNrc20()) { dto.setDecimals(po.getDecimals()); dto.setTotalSupply(ContractUtil.bigInteger2String(po.getTotalSupply())); + } else if (isNrc1155) { + ProgramResult uriResult = contractHelper.invokeViewMethod(chainId, contractAddressBytes, "uri", "() return String", null); + String uri = uriResult.getResult(); + dto.setTokenUri(uri); } } dto.setStatus(status.name()); dto.setMethod(methods); dto.setDirectPayable(po.isAcceptDirectTransfer()); dto.setDirectPayableByOtherAsset(isAcceptDirectTransferByOtherAsset); + dto.setCodeHash(HexUtil.encode(codeHash)); return success(dto); } catch (Exception e) { Log.error(e); @@ -1210,7 +1315,7 @@ public Response contractResultList(Map params) { if (contractResultDto == null) { continue; } - this.filterRealTokenTransfers(chainId, contractResultDto); + //this.filterRealTokenTransfers(chainId, contractResultDto); resultMap.put(hash, contractResultDto); } return success(resultMap); @@ -1270,7 +1375,7 @@ public Response contractResult(Map params) { resultMap.put("msg", msg); } if (flag && contractResultDto != null) { - this.filterRealTokenTransfers(chainId, contractResultDto); + //this.filterRealTokenTransfers(chainId, contractResultDto); resultMap.put("data", contractResultDto); } if (!flag) { @@ -1296,68 +1401,6 @@ private ContractResultDto makeContractResultDto(int chainId, ContractBaseTransac return contractResultDto; } - private void filterRealTokenTransfers(int chainId, ContractResultDto contractResultDto) { - List tokenTransfers = contractResultDto.getTokenTransfers(); - List token721Transfers = contractResultDto.getToken721Transfers(); - Map cache = MapUtil.createHashMap(tokenTransfers.size() + token721Transfers.size()); - do { - if (tokenTransfers == null || tokenTransfers.isEmpty()) { - break; - } - List resultDto = new ArrayList<>(); - for (ContractTokenTransferDto tokenTransfer : tokenTransfers) { - try { - if (StringUtils.isBlank(tokenTransfer.getName())) { - String contractAddress = tokenTransfer.getContractAddress(); - ContractAddressInfoPo po = cache.get(contractAddress); - if (po == null) { - po = contractHelper.getContractAddressInfo( - chainId, AddressTool.getAddress(contractAddress)).getData(); - cache.put(contractAddress, po); - } - if (po == null || !po.isNrc20()) { - continue; - } - tokenTransfer.setNrc20Info(po); - resultDto.add(tokenTransfer); - } - } catch (Exception e) { - Log.error(e); - } - } - contractResultDto.setTokenTransfers(resultDto); - } while (false); - - do { - if (token721Transfers == null || token721Transfers.isEmpty()) { - break; - } - List result721Dto = new ArrayList<>(); - for (ContractToken721TransferDto token721Transfer : token721Transfers) { - try { - if (StringUtils.isBlank(token721Transfer.getName())) { - String contractAddress = token721Transfer.getContractAddress(); - ContractAddressInfoPo po = cache.get(contractAddress); - if (po == null) { - po = contractHelper.getContractAddressInfo( - chainId, AddressTool.getAddress(contractAddress)).getData(); - cache.put(contractAddress, po); - } - if (po == null || TOKEN_TYPE_NRC721 != po.getTokenType()) { - continue; - } - token721Transfer.setNrc721Info(po); - result721Dto.add(token721Transfer); - } - } catch (Exception e) { - Log.error(e); - } - } - contractResultDto.setToken721Transfers(result721Dto); - } while (false); - - } - @CmdAnnotation(cmd = CONTRACT_TX, version = 1.0, description = "合约交易/contract tx") @Parameters(value = { @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链id"), @@ -1394,7 +1437,7 @@ public Response contractTx(Map params) { // 计算交易实际发生的金额 calTransactionValue(txDto); if (contractResultDto != null) { - this.filterRealTokenTransfers(chainId, contractResultDto); + //this.filterRealTokenTransfers(chainId, contractResultDto); txDto.setContractResult(contractResultDto); } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java index 8c6cf8779b..97d9d57d7e 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java @@ -34,6 +34,7 @@ public static SmartContractVersionChangeInvoker instance() { private boolean isloadV8 = false; private boolean isloadV14 = false; + private boolean isloadV15 = false; /** * @@ -47,7 +48,9 @@ public void process(int currentChainId) { Short currentVersion = ProtocolGroupManager.getCurrentVersion(currentChainId); Log.info("触发协议升级，chainId: [{}], 版本为: [{}]", currentChainId, currentVersion); ChainManager chainManager = SpringLiteContext.getBean(ChainManager.class); - if (currentVersion >= ContractContext.PROTOCOL_14) { + if (currentVersion >= ContractContext.PROTOCOL_15) { + this.loadV15(chainManager.getChainMap().get(currentChainId), currentVersion); + } else if (currentVersion >= ContractContext.PROTOCOL_14) { this.loadV14(chainManager.getChainMap().get(currentChainId), currentVersion); } else if (currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { this.loadV8(chainManager.getChainMap().get(currentChainId), currentVersion); @@ -120,4 +123,14 @@ private void loadV14(Chain chain, int currentVersion) { VMFactory.reInitVM_v14(); isloadV14 = true; } + + private void loadV15(Chain chain, int currentVersion) { + if (isloadV15) { + return; + } + chain.clearBatchInfo(); + Log.info("版本[{}]协议升级成功，重新初始化智能合约VM", currentVersion); + VMFactory.reInitVM_v15(); + isloadV15 = true; + } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java new file mode 100644 index 0000000000..ac0f4a2bdb --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java @@ -0,0 +1,215 @@ +package io.nuls.contract.tx.v16; + +import io.nuls.base.basic.AddressTool; +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.contract.enums.TokenTypeStatus; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.model.bo.BatchInfoV8; +import io.nuls.contract.model.bo.ContractInternalCreate; +import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.bo.ContractWrapperTransaction; +import io.nuls.contract.model.dto.CallContractDataDto; +import io.nuls.contract.model.dto.ContractResultDto; +import io.nuls.contract.model.po.ContractAddressInfoPo; +import io.nuls.contract.model.tx.CallContractTransaction; +import io.nuls.contract.model.txdata.CallContractData; +import io.nuls.contract.model.txdata.ContractData; +import io.nuls.contract.processor.CallContractTxProcessor; +import io.nuls.contract.service.ContractService; +import io.nuls.contract.util.ContractUtil; +import io.nuls.contract.util.Log; +import io.nuls.contract.validator.CallContractTxValidator; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.JSONUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static io.nuls.contract.util.ContractUtil.getFailed; + +// add by pierre at 2023/4/26 +@Component("CallContractProcessorV16") +public class CallContractProcessorV16 implements TransactionProcessor { + + @Autowired + private CallContractTxProcessor callContractTxProcessor; + @Autowired + private CallContractTxValidator callContractTxValidator; + @Autowired + private ContractHelper contractHelper; + @Autowired + private ChainManager chainManager; + @Autowired + private ContractService contractService; + + @Override + public int getType() { + return TxType.CALL_CONTRACT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + ChainManager.chainHandle(chainId); + Map result = new HashMap<>(); + List errorList = new ArrayList<>(); + result.put("txList", errorList); + String errorCode = null; + CallContractTransaction callTx; + for(Transaction tx : txs) { + callTx = new CallContractTransaction(); + callTx.copyTx(tx); + try { + Result validate = callContractTxValidator.validateV14(chainId, callTx); + if(validate.isFailed()) { + errorCode = validate.getErrorCode().getCode(); + errorList.add(tx); + } + } catch (NulsException e) { + Log.error(e); + errorCode = e.getErrorCode().getCode(); + errorList.add(tx); + } + } + result.put("errorCode", errorCode); + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader header) { + try { + BatchInfoV8 batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); + if (batchInfo != null) { + Map contractResultMap = batchInfo.getContractResultMap(); + ContractResult contractResult; + ContractWrapperTransaction wrapperTx; + String txHash; + for (Transaction tx : txs) { + txHash = tx.getHash().toString(); + contractResult = contractResultMap.get(txHash); + if (contractResult == null) { + Log.warn("empty contract result with txHash: {}, txType: {}", txHash, tx.getType()); + continue; + } + wrapperTx = contractResult.getTx(); + wrapperTx.setContractResult(contractResult); + this.onCommit(chainId, wrapperTx); + } + } + + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + ChainManager.chainHandle(chainId); + CallContractData call; + for (Transaction tx : txs) { + if (tx.getType() == TxType.CROSS_CHAIN) { + call = ContractUtil.parseCrossChainTx(tx, chainManager); + if (call == null) { + continue; + } + } else { + call = new CallContractData(); + call.parse(tx.getTxData(), 0); + } + this.onRollback(chainId, new ContractWrapperTransaction(tx, call)); + } + return true; + } catch (NulsException e) { + Log.error(e); + return false; + } + } + + private Result onCommit(int chainId, ContractWrapperTransaction tx) { + try { + BlockHeader blockHeader = contractHelper.getBatchInfoCurrentBlockHeaderV8(chainId); + byte[] stateRoot = blockHeader.getStateRoot(); + long blockHeight = blockHeader.getHeight(); + ContractResult contractResult = tx.getContractResult(); + contractResult.setBlockHeight(blockHeight); + + // 保存代币交易 + ContractData callContractData = tx.getContractData(); + byte[] contractAddress = callContractData.getContractAddress(); + String contractAddressStr = AddressTool.getStringAddressByBytes(contractAddress); + + Result contractAddressInfoPoResult = contractHelper.getContractAddressInfo(chainId, contractAddress); + ContractAddressInfoPo contractAddressInfoPo = contractAddressInfoPoResult.getData(); + contractResult.setNrc20(contractAddressInfoPo.isNrc20()); + tx.setBlockHeight(blockHeight); + + Map infoPoMap = new HashMap<>(); + infoPoMap.put(contractAddressStr, contractAddressInfoPo); + // 处理内部创建合约 + List internalCreates = contractResult.getInternalCreates(); + if (internalCreates != null && !internalCreates.isEmpty()) { + for (ContractInternalCreate internalCreate : internalCreates) { + Result result = contractHelper.onCommitForCreateV16(chainId, blockHeader, internalCreate, tx.getHash(), tx.getTime(), internalCreate.getContractAddress(), + internalCreate.getSender(), contractHelper.getContractCode(chainId, stateRoot, internalCreate.getCodeCopyBy()), "internal_create", infoPoMap); + if (result.isFailed()) { + return result; + } + } + } + // 处理合约事件 + contractHelper.dealNrc20Events(chainId, stateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); + + // 保存合约执行结果 + return contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); + } catch (Exception e) { + Log.error("save call contract tx error.", e); + return getFailed(); + } + } + + private Result onRollback(int chainId, ContractWrapperTransaction tx) { + try { + // 回滚代币转账交易 + ContractResult contractResult = tx.getContractResult(); + if (contractResult == null) { + contractResult = contractService.getContractExecuteResult(chainId, tx.getHash()); + } + if (contractResult == null) { + return ContractUtil.getSuccess(); + } + try { + CallContractData contractData = (CallContractData) tx.getContractData(); + Log.info("rollback call tx, contract data is {}, result is {}", JSONUtils.obj2json(new CallContractDataDto(contractData)), JSONUtils.obj2json(new ContractResultDto(chainId, contractResult, contractData.getGasLimit()))); + } catch (Exception e) { + Log.warn("failed to trace call rollback log, error is {}", e.getMessage()); + } + contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); + // 处理内部创建合约 + List internalCreates = contractResult.getInternalCreates(); + if (internalCreates != null && !internalCreates.isEmpty()) { + for (ContractInternalCreate internalCreate : internalCreates) { + Result result = contractHelper.onRollbackForCreateV16(chainId, internalCreate.getContractAddress(), internalCreate.getTokenType() == TokenTypeStatus.NRC20.status()); + if (result.isFailed()) { + return result; + } + } + } + // 删除合约执行结果 + return contractService.deleteContractExecuteResult(chainId, tx.getHash()); + } catch (Exception e) { + Log.error("rollback call contract tx error.", e); + return getFailed(); + } + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java new file mode 100644 index 0000000000..4a2ce6d06a --- /dev/null +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java @@ -0,0 +1,189 @@ +package io.nuls.contract.tx.v16; + +import io.nuls.base.data.BlockHeader; +import io.nuls.base.data.Transaction; +import io.nuls.base.protocol.TransactionProcessor; +import io.nuls.contract.helper.ContractHelper; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.model.bo.BatchInfoV8; +import io.nuls.contract.model.bo.ContractCreate; +import io.nuls.contract.model.bo.ContractResult; +import io.nuls.contract.model.bo.ContractWrapperTransaction; +import io.nuls.contract.model.dto.ContractResultDto; +import io.nuls.contract.model.dto.CreateContractDataDto; +import io.nuls.contract.model.po.ContractAddressInfoPo; +import io.nuls.contract.model.tx.CreateContractTransaction; +import io.nuls.contract.model.txdata.ContractData; +import io.nuls.contract.model.txdata.CreateContractData; +import io.nuls.contract.processor.CreateContractTxProcessor; +import io.nuls.contract.service.ContractService; +import io.nuls.contract.util.Log; +import io.nuls.contract.validator.CreateContractTxValidator; +import io.nuls.core.basic.Result; +import io.nuls.core.constant.TxType; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.exception.NulsException; +import io.nuls.core.parse.JSONUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static io.nuls.contract.util.ContractUtil.getSuccess; + +// add by pierre at 2023/4/26 +@Component("CreateContractProcessorV16") +public class CreateContractProcessorV16 implements TransactionProcessor { + + @Autowired + private CreateContractTxProcessor createContractTxProcessor; + @Autowired + private CreateContractTxValidator createContractTxValidator; + @Autowired + private ContractHelper contractHelper; + @Autowired + private ContractService contractService; + + @Override + public int getType() { + return TxType.CREATE_CONTRACT; + } + + @Override + public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { + ChainManager.chainHandle(chainId); + Map result = new HashMap<>(); + List errorList = new ArrayList<>(); + result.put("txList", errorList); + String errorCode = null; + CreateContractTransaction createTx; + for(Transaction tx : txs) { + createTx = new CreateContractTransaction(); + createTx.copyTx(tx); + try { + Result validate = createContractTxValidator.validate(chainId, createTx); + if(validate.isFailed()) { + errorCode = validate.getErrorCode().getCode(); + errorList.add(tx); + } + } catch (NulsException e) { + Log.error(e); + errorCode = e.getErrorCode().getCode(); + errorList.add(tx); + } + } + result.put("errorCode", errorCode); + return result; + } + + @Override + public boolean commit(int chainId, List txs, BlockHeader header) { + try { + BatchInfoV8 batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); + if (batchInfo != null) { + Map contractResultMap = batchInfo.getContractResultMap(); + ContractResult contractResult; + ContractWrapperTransaction wrapperTx; + String txHash; + for (Transaction tx : txs) { + txHash = tx.getHash().toString(); + contractResult = contractResultMap.get(txHash); + if (contractResult == null) { + Log.warn("empty contract result with txHash: {}", txHash); + continue; + } + wrapperTx = contractResult.getTx(); + wrapperTx.setContractResult(contractResult); + this.onCommit(chainId, wrapperTx); + } + } + + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + @Override + public boolean rollback(int chainId, List txs, BlockHeader blockHeader) { + try { + ChainManager.chainHandle(chainId); + CreateContractData create; + for (Transaction tx : txs) { + create = new CreateContractData(); + create.parse(tx.getTxData(), 0); + this.onRollback(chainId, new ContractWrapperTransaction(tx, create)); + } + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + private Result onCommit(int chainId, ContractWrapperTransaction tx) throws Exception { + BlockHeader blockHeader = contractHelper.getBatchInfoCurrentBlockHeaderV8(chainId); + long blockHeight = blockHeader.getHeight(); + tx.setBlockHeight(blockHeight); + ContractResult contractResult = tx.getContractResult(); + contractResult.setBlockHeight(blockHeight); + Result saveContractExecuteResult = contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); + if (saveContractExecuteResult.isFailed()) { + return saveContractExecuteResult; + } + // 执行失败的合约直接返回 + if (!contractResult.isSuccess()) { + return getSuccess(); + } + CreateContractData txData = (CreateContractData) tx.getContractData(); + byte[] contractAddress = txData.getContractAddress(); + byte[] sender = txData.getSender(); + String alias = txData.getAlias(); + byte[] code = txData.getCode(); + byte[] newestStateRoot = blockHeader.getStateRoot(); + + ContractCreate create = new ContractCreate(); + create.setTokenType(contractResult.getTokenType()); + create.setTokenName(contractResult.getTokenName()); + create.setTokenSymbol(contractResult.getTokenSymbol()); + create.setTokenDecimals(contractResult.getTokenDecimals()); + create.setTokenTotalSupply(contractResult.getTokenTotalSupply()); + create.setAcceptDirectTransfer(contractResult.isAcceptDirectTransfer()); + Map infoPoMap = new HashMap<>(); + Result result = contractHelper.onCommitForCreateV16(chainId, blockHeader, create, tx.getHash(), tx.getTime(), contractAddress, sender, code, alias, infoPoMap); + if (result.isFailed()) { + return result; + } + //处理NRC20合约事件 + contractHelper.dealNrc20Events(chainId, newestStateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); + return result; + } + + private Result onRollback(int chainId, ContractWrapperTransaction tx) throws Exception { + ContractData txData = tx.getContractData(); + byte[] contractAddress = txData.getContractAddress(); + // 回滚代币转账交易 + ContractResult contractResult = tx.getContractResult(); + if (contractResult == null) { + contractResult = contractService.getContractExecuteResult(chainId, tx.getHash()); + } + if (contractResult == null) { + return Result.getSuccess(null); + } + try { + CreateContractData contractData = (CreateContractData) tx.getContractData(); + Log.info("rollback create tx, contract data is {}, result is {}", JSONUtils.obj2json(new CreateContractDataDto(contractData)), JSONUtils.obj2json(new ContractResultDto(chainId, contractResult, contractData.getGasLimit()))); + } catch (Exception e) { + Log.warn("failed to trace create rollback log, error is {}", e.getMessage()); + } + contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); + Result result = contractHelper.onRollbackForCreateV16(chainId, contractAddress, contractResult.isNrc20()); + if (result.isFailed()) { + return result; + } + return contractService.deleteContractExecuteResult(chainId, tx.getHash()); + } +} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java index d1a7c37d66..385f4d03c5 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java @@ -34,10 +34,12 @@ import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractErrorCode; +import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.model.bo.*; import io.nuls.contract.model.dto.AccountAmountDto; import io.nuls.contract.model.dto.ContractTokenTransferInfo; +import io.nuls.contract.model.po.ContractAddressInfoPo; import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.tx.*; import io.nuls.contract.model.txdata.CallContractData; @@ -46,6 +48,8 @@ import io.nuls.contract.model.txdata.DeleteContractData; import io.nuls.contract.rpc.call.BlockCall; import io.nuls.contract.rpc.call.ChainManagerCall; +import io.nuls.contract.vm.program.ProgramMethod; +import io.nuls.contract.vm.program.ProgramMethodArg; import io.nuls.contract.vm.program.ProgramMultyAssetValue; import io.nuls.core.basic.Result; import io.nuls.core.constant.ErrorCode; @@ -277,6 +281,9 @@ public static ContractTokenTransferInfoPo convertJsonToTokenTransferInfoPo(int c Map eventMap = JSONUtils.json2map(event); String eventName = (String) eventMap.get(CONTRACT_EVENT); String contractAddress = (String) eventMap.get(CONTRACT_EVENT_ADDRESS); + if (ContractContext.getTokenType(contractAddress) != TokenTypeStatus.NRC20.status()) { + return null; + } po = new ContractTokenTransferInfoPo(); po.setContractAddress(contractAddress); if (NRC20_EVENT_TRANSFER.equals(eventName)) { @@ -321,48 +328,145 @@ public static ContractTokenTransferInfo convertJsonToTokenTransferInfo(int chain Map eventMap = JSONUtils.json2map(event); String eventName = (String) eventMap.get(CONTRACT_EVENT); String contractAddress = (String) eventMap.get(CONTRACT_EVENT_ADDRESS); + ContractAddressInfoPo contractAddressInfo = ContractContext.getContractAddressInfo(contractAddress); + int tokenType = contractAddressInfo.getTokenType(); info = new ContractTokenTransferInfo(); info.setContractAddress(contractAddress); if (NRC20_EVENT_TRANSFER.equals(eventName)) { - boolean isNRC20; - Map data = (Map) eventMap.get(CONTRACT_EVENT_DATA); - isNRC20 = data.containsKey(VALUE); - if (!isNRC20) { + if (tokenType != TokenTypeStatus.NRC20.status()) { return null; } - String from = (String) data.get(FROM); - String to = (String) data.get(TO); - String value = (String) data.get(VALUE); - if (AddressTool.validAddress(chainId, from)) { - info.setFrom(from); - } - if (AddressTool.validAddress(chainId, to)) { - info.setTo(to); - } - if (isNRC20) { - info.setTokenType(TOKEN_TYPE_NRC20); - info.setValue(isBlank(value) ? BigInteger.ZERO : new BigInteger(value)); + Map data = (Map) eventMap.get(CONTRACT_EVENT_DATA); + info.setTokenType(TokenTypeStatus.NRC20.status()); + info.setName(contractAddressInfo.getNrc20TokenName()); + info.setSymbol(contractAddressInfo.getNrc20TokenSymbol()); + info.setDecimals(contractAddressInfo.getDecimals()); + Collection values = data.values(); + int i = 0; + String transferEventdata; + for (Object object : values) { + transferEventdata = (String) object; + if (i == 0 || i == 1) { + if (AddressTool.validAddress(chainId, transferEventdata)) { + if (i == 0) { + info.setFrom(transferEventdata); + } else { + info.setTo(transferEventdata); + } + } + } + if (i == 2) { + info.setValue(isBlank(transferEventdata) ? "0" : transferEventdata); + break; + } + i++; } return info; } else if (NRC721_EVENT_TRANSFER.equals(eventName)) { - boolean isNRC721; + if (tokenType != TokenTypeStatus.NRC721.status()) { + return null; + } Map data = (Map) eventMap.get(CONTRACT_EVENT_DATA); - isNRC721 = data.containsKey(TOKEN_ID); - if (!isNRC721) { + info.setTokenType(TokenTypeStatus.NRC721.status()); + info.setName(contractAddressInfo.getNrc20TokenName()); + info.setSymbol(contractAddressInfo.getNrc20TokenSymbol()); + Collection values = data.values(); + int i = 0; + String transferEventdata; + for (Object object : values) { + transferEventdata = (String) object; + if (i == 0 || i == 1) { + if (AddressTool.validAddress(chainId, transferEventdata)) { + if (i == 0) { + info.setFrom(transferEventdata); + } else { + info.setTo(transferEventdata); + } + } + } + if (i == 2) { + info.setValue(isBlank(transferEventdata) ? "0" : transferEventdata); + break; + } + i++; + } + return info; + } else if (NRC1155_EVENT_TRANSFER_SINGLE.equals(eventName)) { + if (tokenType != TokenTypeStatus.NRC1155.status()) { return null; } - String from = (String) data.get(FROM); - String to = (String) data.get(TO); - String tokenId = (String) data.get(TOKEN_ID); - if (AddressTool.validAddress(chainId, from)) { - info.setFrom(from); + Map data = (Map) eventMap.get(CONTRACT_EVENT_DATA); + info.setTokenType(TokenTypeStatus.NRC1155.status()); + info.setName(contractAddressInfo.getNrc20TokenName()); + info.setSymbol(contractAddressInfo.getNrc20TokenSymbol()); + Collection values = data.values(); + int i = 0; + String transferEventdata; + for (Object object : values) { + transferEventdata = (String) object; + if (i <= 2) { + if (AddressTool.validAddress(chainId, transferEventdata)) { + if (i == 0) { + info.setOperator(transferEventdata); + } else if (i == 1) { + info.setFrom(transferEventdata); + } else { + info.setTo(transferEventdata); + } + } + } + if (i == 3) { + info.setId(isBlank(transferEventdata) ? "0" : transferEventdata); + } else if (i == 4) { + info.setValue(isBlank(transferEventdata) ? "0" : transferEventdata); + break; + } + i++; } - if (AddressTool.validAddress(chainId, to)) { - info.setTo(to); + return info; + } else if (NRC1155_EVENT_TRANSFER_BATCH.equals(eventName)) { + if (tokenType != TokenTypeStatus.NRC1155.status()) { + return null; } - if (isNRC721) { - info.setTokenType(TOKEN_TYPE_NRC721); - info.setValue(isBlank(tokenId) ? BigInteger.ZERO : new BigInteger(tokenId)); + Map data = (Map) eventMap.get(CONTRACT_EVENT_DATA); + info.setTokenType(TokenTypeStatus.NRC1155.status()); + info.setName(contractAddressInfo.getNrc20TokenName()); + info.setSymbol(contractAddressInfo.getNrc20TokenSymbol()); + Collection datas = data.values(); + int i = 0; + String transferEventdata; + for (Object object : datas) { + if (i <= 2) { + transferEventdata = (String) object; + if (AddressTool.validAddress(chainId, transferEventdata)) { + if (i == 0) { + info.setOperator(transferEventdata); + } else if (i == 1) { + info.setFrom(transferEventdata); + } else { + info.setTo(transferEventdata); + } + } + } + if (i == 3) { + List ids = (List) object; + String[] _ids = null; + if (ids != null) { + _ids = new String[ids.size()]; + ids.toArray(_ids); + } + info.setIds(_ids); + } else if (i == 4) { + List values = (List) object; + String[] _values = null; + if (values != null) { + _values = new String[values.size()]; + values.toArray(_values); + } + info.setValues(_values); + break; + } + i++; } return info; } @@ -373,6 +477,22 @@ public static ContractTokenTransferInfo convertJsonToTokenTransferInfo(int chain } } + public static String[] big2strArray(BigInteger[] bigArray) { + String[] result = new String[bigArray.length]; + for (int i = 0; i < bigArray.length; i++) { + result[i] = bigArray[i].toString(); + } + return result; + } + + public static BigInteger[] str2bigArray(String[] strArrays) { + BigInteger[] result = new BigInteger[strArrays.length]; + for (int i = 0; i < strArrays.length; i++) { + result[i] = new BigInteger(strArrays[i]); + } + return result; + } + public static boolean isContractTransaction(Transaction tx) { if (tx == null) { return false; @@ -898,4 +1018,17 @@ public static ProgramMultyAssetValue[] multyAssetObjectArray(String[][] multyAss } return array; } + + public static String methodSignature(ProgramMethod method) { + List args = method.getArgs(); + StringBuilder key = new StringBuilder(method.getName()).append("("); + if (args != null && !args.isEmpty()) { + for (int i=0;i assetDecimalsCache = new ConcurrentHashMap<>(); private static Map NRC20_METHODS = null; private static Map NRC721_METHODS = null; - private static ProgramMethod NRC721_OVERLOAD_METHOD_SAFE_DATA = null; - private static ProgramMethod NRC721_OVERLOAD_METHOD_SAFE = null; + private static Map NRC1155_METHODS = null; /** * @param hash @@ -186,6 +190,19 @@ public BigInteger getTotalBalance(int chainId, int assetChainId, int assetId, by return BigInteger.ZERO; } + public int getCrossAssetsDecimals(int assetChainId, int assetId) { + String key = assetChainId + ContractConstant.LINE + assetId; + Integer decimals = assetDecimalsCache.get(key); + if (decimals == null || decimals.intValue() == 0) { + int callResult = ChainManagerCall.getCrossAssetsDecimals(assetChainId, assetId); + if (callResult > 0) { + assetDecimalsCache.put(key, callResult); + } + return callResult; + } + return decimals; + } + public static Map getNrc20Methods() { return NRC20_METHODS; } @@ -202,20 +219,12 @@ public static void setNrc721Methods(Map nrc721Methods) { NRC721_METHODS = nrc721Methods; } - public static ProgramMethod getNrc721OverloadMethodSafeData() { - return NRC721_OVERLOAD_METHOD_SAFE_DATA; - } - - public static void setNrc721OverloadMethodSafeData(ProgramMethod nrc721OverloadMethodSafeData) { - NRC721_OVERLOAD_METHOD_SAFE_DATA = nrc721OverloadMethodSafeData; - } - - public static ProgramMethod getNrc721OverloadMethodSafe() { - return NRC721_OVERLOAD_METHOD_SAFE; + public static Map getNrc1155Methods() { + return NRC1155_METHODS; } - public static void setNrc721OverloadMethodSafe(ProgramMethod nrc721OverloadMethodSafe) { - NRC721_OVERLOAD_METHOD_SAFE = nrc721OverloadMethodSafe; + public static void setNrc1155Methods(Map nrc1155Methods) { + NRC1155_METHODS = nrc1155Methods; } public long getBestHeight(int chainId) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java index c1cadff76e..6ea2869435 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java @@ -1144,6 +1144,15 @@ public BlockHeaderDto getBlockHeader(long number) { } } + // add by pierre at 2022/7/18 p15 + public int getCrossAssetsDecimals(int assetChainId, int assetId) { + if (this.vmContext != null) { + return this.vmContext.getCrossAssetsDecimals(assetChainId, assetId); + } else { + throw new RuntimeException(String.format("vmContext is null, parms: %s, %s", assetChainId, assetId)); + } + } + public String getRandomSeed(long endHeight, int count, String algorithm) { if (this.vmContext != null) { String seed; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java index 367d04b0be..96caee1f53 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java @@ -344,6 +344,22 @@ public static void reInitVM_v14() { waitCreate.countDown(); } + public static void reInitVM_v15() { + waitCreate = new CountDownLatch(1); + MethodArea.INIT_CLASS_CODES.clear(); + MethodArea.INIT_METHOD_CODES.clear(); + Heap.INIT_OBJECTS.clear(); + Heap.INIT_ARRAYS.clear(); + + VM = loadVM_v15(); + + MethodArea.INIT_CLASS_CODES.putAll(VM.methodArea.getClassCodes()); + MethodArea.INIT_METHOD_CODES.putAll(VM.methodArea.getMethodCodes()); + Heap.INIT_OBJECTS.putAll(VM.heap.objects); + Heap.INIT_ARRAYS.putAll(VM.heap.arrays); + waitCreate.countDown(); + } + private static VM loadVM_v8() { VM vm = new VM(); Map classCodes = new LinkedHashMap<>(1024); @@ -395,4 +411,27 @@ private static VM loadVM_v14() { return vm; } + private static VM loadVM_v15() { + VM vm = new VM(); + Map classCodes = new LinkedHashMap<>(1024); + for (String className : CLINIT_CLASSES) { + ClassCode classCode = ClassCodeLoader.loadFromResource_v15(className); + classCodes.put(classCode.name, classCode); + } + for (String className : ProgramConstants.SDK_CLASS_NAMES_V8_ADD) { + ClassCode classCode = ClassCodeLoader.loadFromResource_v15(className); + classCodes.put(classCode.name, classCode); + } + for (String className : ProgramConstants.SDK_CLASS_NAMES_V14_ADD) { + ClassCode classCode = ClassCodeLoader.loadFromResource_v15(className); + classCodes.put(classCode.name, classCode); + } + vm.methodArea.loadClassCodes(classCodes); + + ProgramConstants.SDK_CLASS_NAMES = ArrayUtils.addAll(ProgramConstants.SDK_CLASS_NAMES, ProgramConstants.SDK_CLASS_NAMES_V8_ADD); + ProgramConstants.SDK_CLASS_NAMES = ArrayUtils.addAll(ProgramConstants.SDK_CLASS_NAMES, ProgramConstants.SDK_CLASS_NAMES_V14_ADD); + + return vm; + } + } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java index 0313d68ba8..2ff9491212 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java @@ -55,6 +55,7 @@ public class ClassCodeLoader { private static final Map RESOURCE_CLASS_CODES; private static final Map RESOURCE_CLASS_CODES_V8; private static final Map RESOURCE_CLASS_CODES_V14; + private static final Map RESOURCE_CLASS_CODES_V15; private static final LoadingCache> CACHE; @@ -73,6 +74,7 @@ public Map load(@Nonnull final ClassCodeCacheKey cacheKey) { RESOURCE_CLASS_CODES = loadFromResource(); RESOURCE_CLASS_CODES_V8 = loadFromResource_v8(); RESOURCE_CLASS_CODES_V14 = loadFromResource_v14(); + RESOURCE_CLASS_CODES_V15 = loadFromResource_v15(); } public static ClassCode load(String className) { @@ -111,7 +113,19 @@ public static ClassCode loadFromResource_v14(String className) { } } + public static ClassCode loadFromResource_v15(String className) { + ClassCode classCode = RESOURCE_CLASS_CODES_V15.get(className); + if (classCode == null) { + throw new RuntimeException("can't load class " + className); + } else { + return classCode; + } + } + public static ClassCode getFromResource(String className) { + if (ProtocolGroupManager.getCurrentVersion(ContractContext.CHAIN_ID) >= ContractContext.PROTOCOL_15) { + return RESOURCE_CLASS_CODES_V15.get(className); + } if (ProtocolGroupManager.getCurrentVersion(ContractContext.CHAIN_ID) >= ContractContext.PROTOCOL_14) { return RESOURCE_CLASS_CODES_V14.get(className); } @@ -223,6 +237,10 @@ private static Map loadFromResource_v14() { return loadFromResourceWithResourceName("/used_classes_sdk_v14"); } + private static Map loadFromResource_v15() { + return loadFromResourceWithResourceName("/used_classes_sdk_v15"); + } + private static Map loadFromResourceWithResourceName(String usedClassesName) { try (InputStream sdkInputStream = ClassCodeLoader.class.getResourceAsStream(usedClassesName)) { if (sdkInputStream == null) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java index ab2510bea3..7e69ec07e6 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java @@ -25,6 +25,8 @@ package io.nuls.contract.vm.natives.io.nuls.contract.sdk; import io.nuls.base.basic.AddressTool; +import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.contract.config.ContractContext; import io.nuls.contract.vm.*; import io.nuls.contract.vm.code.MethodCode; import io.nuls.contract.vm.exception.ErrorException; @@ -424,6 +426,12 @@ public static ProgramResult call(String address, String methodName, String metho frame.vm.getEvents().addAll(programResult.getEvents()); frame.vm.getInvokeRegisterCmds().addAll(programResult.getInvokeRegisterCmds()); frame.vm.getOrderedInnerTxs().addAll(programResult.getOrderedInnerTxs()); + // add by pierre at 2022/7/18 p14 + int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_15 ) { + frame.vm.getInternalCreates().addAll(programResult.getInternalCreates()); + } + // end code by pierre return programResult; } else { // add by pierre at 2020-11-03 可能影响兼容性，考虑协议升级 diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java index 08d1314a7e..fb1bfce306 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java @@ -576,6 +576,25 @@ private static Result invokeExternalCmd(MethodCode methodCode, MethodArgs method String[] args = (String[]) frame.heap.getObject(argsRef); return getCodeHash(args, methodCode, frame); } + } else if ("assetDecimals".equals(cmdName)) { + // add by pierre at 2022/7/18 p15 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_15 ) { + String[] args = (String[]) frame.heap.getObject(argsRef); + return assetDecimals(args, methodCode, frame); + } + } else if ("currentChainId".equals(cmdName)) { + // add by pierre at 2022/7/18 p15 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_15 ) { + ObjectRef objectRef = frame.heap.newString(frame.vm.getProgramExecutor().getCurrentChainId() + ""); + Result result = NativeMethod.result(methodCode, objectRef, frame); + return result; + } + } else if ("getAddressByPublicKey".equals(cmdName)) { + // add by pierre at 2022/8/25 p15 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_15 ) { + String[] args = (String[]) frame.heap.getObject(argsRef); + return getAddressByPublicKey(args, methodCode, frame); + } } String[] args = (String[]) frame.heap.getObject(argsRef); @@ -671,6 +690,38 @@ private static Result getCodeHash(String[] args, MethodCode methodCode, Frame fr } } + private static Result getAddressByPublicKey(String[] args, MethodCode methodCode, Frame frame) { + try { + int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); + String pubkey = args[0]; + String resultStr = ""; + if (Utils.isHexString(pubkey)) { + byte[] publicKey = HexUtil.decode(pubkey); + if (publicKey != null && publicKey.length == 33) { + resultStr = AddressTool.getAddressString(publicKey, currentChainId); + } + } + Object resultValue = frame.heap.newString(resultStr); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } catch (Exception e) { + throw new ErrorException("Invoke external cmd failed. When getAddressByPublicKey.", frame.vm.getGasUsed(), e.getMessage()); + } + } + + private static Result assetDecimals(String[] args, MethodCode methodCode, Frame frame) { + try { + int assetChainId = Integer.parseInt(args[0]); + int assetId = Integer.parseInt(args[1]); + int decimals = frame.vm.getCrossAssetsDecimals(assetChainId, assetId); + Object resultValue = frame.heap.newString(decimals + ""); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } catch (Exception e) { + throw new ErrorException("Invoke external cmd failed. When getAssetDecimals.", frame.vm.getGasUsed(), e.getMessage()); + } + } + private static Result computeAddress(String[] args, MethodCode methodCode, Frame frame) { try { int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java index b22037b536..6c91494ea0 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java +++ b/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java @@ -159,7 +159,7 @@ public boolean equals(Object o) { return returnArg != null ? returnArg.equals(that.returnArg) : that.returnArg == null; } - public boolean equalsNrc20Method(Object o) { + public boolean equalsTokenMethod(Object o) { if (this == o) { return true; } @@ -182,41 +182,7 @@ public boolean equalsNrc20Method(Object o) { if (that.args == null) { return false; } - if (!isEqualNrc20Args(args, that.args)) { - return false; - } - } else { - if (that.args != null) { - return false; - } - } - return returnArg != null ? returnArg.equals(that.returnArg) : that.returnArg == null; - } - - public boolean equalsNrc721Method(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - ProgramMethod that = (ProgramMethod) o; - - if (view != that.view) { - return false; - } - if (event != that.event) { - return false; - } - if (name != null ? !name.equals(that.name) : that.name != null) { - return false; - } - if (args != null) { - if (that.args == null) { - return false; - } - if (!isEqualNrc721Args(args, that.args)) { + if (!isEqualTokenArgs(args, that.args)) { return false; } } else { @@ -240,44 +206,7 @@ public String[] argsType2Array() { } } - private boolean isEqualNrc20Args(List a, List b) { - if (a.size() != b.size()) { - return false; - } else { - /* - // 参数类型、名称完全相同 - Map mapA = a.stream().collect(Collectors.toMap(ProgramMethodArg::getName, Function.identity(), (key1, key2) -> key2, LinkedHashMap::new)); - Map mapB = b.stream().collect(Collectors.toMap(ProgramMethodArg::getName, Function.identity(), (key1, key2) -> key2, LinkedHashMap::new)); - Set> entriesA = mapA.entrySet(); - String methodName; - ProgramMethodArg methodArg; - for(Map.Entry entryA : entriesA) { - methodName = entryA.getKey(); - if(!mapB.containsKey(methodName)) { - return false; - } - methodArg = entryA.getValue(); - if(!methodArg.equalsNrc20(mapB.get(methodName))) { - return false; - } - } - */ - - // 参数类型相同 - int size = a.size(); - ProgramMethodArg argA, argB; - for (int i = 0; i < size; i++) { - argA = a.get(i); - argB = b.get(i); - if (!argA.equalsNrc20(argB)) { - return false; - } - } - return true; - } - } - - private boolean isEqualNrc721Args(List a, List b) { + private boolean isEqualTokenArgs(List a, List b) { if (a.size() != b.size()) { return false; } else { @@ -287,7 +216,7 @@ private boolean isEqualNrc721Args(List a, ListQp_a>Y467znSUjX_1oz27v+qfB*oX*Tql<_<N_|XInX^00|3bVL7p^^+4G3gPg~uB=>8fItYJ^ODT)1E#F9lzfgnRNK4^T z>DQdG0AK}j<$lX%=*;w1ld+>@g9fytc9ohcWY6XZZ-1dw zXKA=HHB!RLBFMscCn}duT_q5rF3a z!(}n%asaSPG37Y$QFiw2!47^NJONHA)eVAuk++)eiJx+}bC=3dt+9k1j1N(FDqWI$ z)oay`mhpQ=!Q;jh|y^9QUE73V$ zs+1~T8*GaQ8Q(la?}*%ote!0;aBnM9NRmVrU+od=5!7U;8XT`iIc>TtDpYiC zc;qG(?^)F~9U3^S>_lR6{tnT5`>1-%Tc@0Nh#Q31K5O?*W4Uej^M^D1El zGUK`3xIHcK5wsPa{&@D~9t$#*E8`0%6R*kR*vGnPehl=hdW4qXN9~Rrm1P;Z6OcrP zhDcFP$U}a=_t7aZ5oXK!Xx}!!!HzaUXS6XvEEtodpe#SV)j;t;hnYaS3bH1|}J zE2fXDt<$NI#S-W%IvK)$=HQYg7&t>=FoU`Ude^%@cb~wEFh`FR3R4Ev>7VO{kjkqU zweO=&2YD7M%^p|#A!x_DZeohaNM0(-bn~<*+Xgql^TIK>-1`8wlNl<>i6GYw}h z!-3UA^fBHbgYc~~4t{|Hu~Td|*Fgfkf3%xTu1`-#ji3*}Qd0ohkf@lfVB{#((-~es zaQ#ps5BAzSa;z0azunj0Zb_=}Pn7RKz1Z+_cyX;Xci!RF>>Fa8-@U~-d(VK5SL>C1 zM`pQ3_gH-re>HSRu`~zE8nRkowl%T3tHVCM94O;Jr=}kM1SBU34pE#@CM5>~0H6T* zE2B&FJ6q*wV_{_d3uDLf?-SDOB(FFiDWeZ$TRGP)Rqqg4#nOk+ zgw#t5!Xw07sFOFyg-uQh$myqBrhgi>p10&vg8zioIfx)R77;}+z;C3 zE74avY&*}f)3|y9(C%>SaSo5M2d>WBwmr*-2VUMsAU&eh5Pg)a=nZ-imWX~^kgd`E zzJQ>Fpm&t-S>7;2h2Ey3YuIV^Dq^w@oB`=fSBv*cGIa3fZstP?eoULL7VdRs7~ZW! zul+!wtA~!An>ejXtWOxwtdkzH(nY7as1~WTi zo@2vT7R$EKd3dnHIvsLJpH|o_$zTdaVLvZad-t$NkW3X|EwF}ZEzHhvdk(X|$*1Yf zl8JV=?#@EhG0Qh_6R7N7N|GP{Fow-6(ZO~30d&WqUwkkwXXm43uBlo*(!n8aTy>WN zS1)Eog2XHb7F~N4*XUEE0!EG3>s#Z>W52iu0 zP};_Dmj7r!t!T_bl!o4OKN0?qO{lpc=h0qC|9~mVo z3Q^|B72ATCFF3rNbNI|r>8w7CiF0hzsM1=95LxY{;#HZA-M5q|)oPjkGESXdHxx9- zwy1DU+Kt+PhNp9}aYzr-i-gpjgOjGgP5N}M{5ETqWvbkdCb?~7o*Px`tTZ-Fn<1+3 zWV%kHQ;B|55)D)iE>K^gX_;*A;FAXS$a}9&c%ALCKcKIl_ za~F&8S7Jj)reUJi0;l4S06UtnY`N*CbK`-SZ$nH`Pk?4!prht0H2}XamhmgYNK)Ya`X(D*r&;ejRa3tYQGnd56X) zZKGT~7bYy`kkqIC7VN;ru{eWfqr`3c8eGmN=)6&(J^FA7Pt1!b3wCBC_a0NXy+FrH zKBtnz#$aRS!we_zw}g2?V2@^x2V)F1MHcufwrWoLYRGg!;5`9g@wKizci;+Nz;9&K zJV|Z7By)GAJaFLT%u-n3>Wsn03t}o()Mbq|tkpGv959xi{>6A@vX2<&{_O~l=G>^c zu1ovHpUb%`Z@}J*DAXsGE=a5xS#bCRz9D`saBgR8;T3*au`q^87IieDdN=5rmM->dzk!2-s^~*A1 zY;w5?9?)rkhzOvg)P>(8Qf8Bp+r}Y-jUN#2)Xj%t2hs1uTf%IY5rYdLPAm?oAgz7A zOeNGxKTF-loRUj4Lvs$6>I{_fzcqFzHq=lVtS2@!m-)aJo1$F@I1b~lxlIu_SXeKZ zO#*X9rLl!kegRWE0G!3Ia<7wJ)Hyt*GtMNpgMshdb%|yaXxmZuYJ~S5Xf%_pre{Ao z&blm4Zug8Nf#WTtFl39?h3SV@#!Auzc=ogqsC82a>#5MHORx}t9a3z_^p4oJ7aQw?v?n1}J^Y{=i{TpXZZoy= zy6tjpC-MQ;WykB$uYu3 z^7-4quMGY^Jpzvjfu4br*)=h|MU8ZO6x*3_svp1^5HIq-jg#g;w9b|4t`_s&HB^;? zBMB&nHrAwEFL%D2g4Y&t>IPr{0K{;Ao`U~BJ@!9OL8X_o@K2AuAZ}a+hygy>$N$5H ztdMYjx@gmUxIB`KJAQYJEdbr>u(di`3(Wy4Ox12T_*rg5Yh)jE0EowavYBy*S^Agz z$2$<)a4NWD+_ZqU%^G}Wjg!X&I*xd)Kuc5U{2ticnDWhXwI%8bOVOXVqdS?AN2 zOF96yb7|DQ>O7)wWsYUs-aU0sUlyFBrucqsPm18GZMn(nTz$pfIT)~8F9b_m`wJ^I%^IU+hl@Fx@2e%m=ftm3UpGcBqHaQla@2{HtVS|rG6`0k7$piHaIrL z?%W+FWXdE9PVFT&tV$%;HiQ)K%XygPHybG=CD-kPuW>diFL2v0#c|5$-j2NZ%jw^tIZPsrXmciGM z;Hz>lVC_2v?3Li*sZ*#sfLznXf)sC+#o1uc;(47l-DK4&TYxKg!eVZd8ouiiFqNH`Np||AYbfL z4D`VOUva4z5|?E?9nQ&XpjVn;r(3>3wZ2x!%v{WJ-9*51)o*e_w1fKDxJY1{yC>!= z@Ipnp=zT~Yy+A0+5P|OO&cBLJ^1FkE5frvd#n$5K_`YP;75B1`VAAQ7Kb@{${TjiEF-U#tUf#6 zt@iGq*t%r83Vw0dB2R203_5>Ow4*1w zWk7Z2*f;sX2`&q!#hdJ0h1f4*9H!xJT)~s6s+y6sI={jTT(>DXDjks=@fR9YC^}Lp zC^sjPszKi*izP!6_l%XA?tS9ZO)KPJ>!NE5c!YX_Trkr;4H|Le$`Bk(|lYvzrKB-N5*(=t$ z?KS!DE*-+oM%IphTI$!=Hgh~+U|>jK&dy*e&S0z}V3q4%C-b(I8b4+z;SV-Yvs4Mu zQPoh##`04#>GD=F7pd`b@K)uMGc*fzvXf}ymHWl=1LTYFk}=R}uklh)u{492A`<~4 z0fW#p(gTZ=f}#Fl)qwVIRg9h$vwi-)1h4+P>Xg4zo!`*V-pIk>Pvt9=G-apxkROe0 zj4afJkO2YDJL)C+Tm9@69bcIu_X}kiyBt{;I5(W6-2pRWdY$+Cel(<*L;iJ0`vFs$HG z#L;Wj!`m zRhSj&uK}9(1hHu38M{FBF~Ei}%raD!x+m3Jz2@w?0M#{{WS@;&X%Mbh&Y z-C^c1GltiwprJ?GFbkFma%`IAuUn92fPHvq`ObZqSX!*cADM;(wmeuhZ}UWv^2QjO z2Q>PIS{-3puw+W~f(*USSXlxubH>_j1r@buR-Gg!LTvRKu21sc@6VQ4V;P%fhP#^C zC9Ne_@JEWbD&wkbc@yUOHRU&`!S&913MSrbRp2IMn5jA@=VF?Qv16L{C-`#NgRyqg zSL0~+Tw$4wI_P2*pN&F7g1JV!7fAXl#Oo+jDKRz0oqDMBNc|m4GO&D?Bnh^+`5#Rhhskhn z^{TLM^*b@)KBd5$&~<`C>WaMsR-V*BGEmsI(y)n+ zZO z56mCn{az8{%?{%=olkf7uey-9?DgJE@xOAxw$#^DecjSh z*2|5<1x*9p8gS@AW_8Jl(2=k<=%tN3 z6WdO{p*7-;z%jN;GytzS3D1&HAK;Ajdu-eaFQ3a^DD~s)j$(ckO{;HS}-D+~D9Q%<#??*6Dhf8>TK-6~gXH3$+y zU8NRRA|pZnWZDXCkm}_+@SWU1CHQ%DsPv-Q>rR=pFJIlC0Bj?-Ac7GV5uzX}L{$yL zz!&LrIVQe3H^fkhvx`F=UB{7e&MEeCTVy8dyiP}w`7A*cQSU(DgG89Pkn!zRZbw`p z#5HZHwx#RPY|)V_Y!gG+)JBsmd)X}H!`oik`BUEQZj6dqK#`#-FZb7Bkb5(-_cACu zWUi=J14Ar4CoYLT-Lx=qYJnM;bU@S1@876smrA zmtlwZWw)niM>{b4pts)&$TtuVm=zB+31QVmctP1u7N1B^OqiNuV8990s`jpmskj*u zG>+P?78k-c&I*m2Vx5O~Z2b0WGvYe+OzH9=YxcyMk}=ZaufJRb5-wvD5#kuRk)lVX zL4$nxAWF5_>l0JMq(MWJ5)!=h)jfd$n=M(36XlS*IOM9tc^OR6Zl|2C;G&H(>k0Ob z15VIq=ERzjXa@r<5?F-|i;=!QuRPbArrhVr%2J3sWP*5?HM{Tt9{klTI*B-CvIjSj@#3jK`L2rwYBYexZJ{SJnu2XG7z3&$b7 z1g_Ph#$L7c`p2QJqdZK%LMdHzI&FQ2l6L6SN&elbDL9}TNY zGW<{LbwR_JYEL)P_3X~gm^JUuVfg2Tur!rL<_BP%eV=3W;1FGxg-B4(kdOQlcAozM zb_qpU8AT&|Gkr@l_ZR&CV@uj)dg)(m3Cbeh7fLZ0nBuNavGmmp1S}BnR&t1HDO$Hm z%}uNl84^1a=&k^`P#g4e0fhQP*|(PqEz#qRE&zM;(A7veNP5YiWUNvpI~39&9~#ZL zq&QRs%ARrcHSpK;A|FOgj0Qu{0Vycd=Kjx=nLv3ZqQsWs1N-T_20%bez4kqE%u+l?u53=K_<6+ z##)ZGt(rmE99}Fzg`k?g`Lx8|&MJXD@xmO23ji*#310}~8Eah^-t6*+J5LXA+t6N! z2ZR;`Sdc}yjt|V*Sdu`Qp_DVzll=k}30?9EO?pXJhW5P^z79OadTk@1QJ*P^D(oFf zypb4{7czPh`5X!?yGh0mwJpuWY4dle7_1{VuZ+2n*-PdiK?ghymY#y8+E`i)(Mh6j z4^GHY*(-b)uUd+E_?c$+1|(JIwah;Y6gtLyIo_#yG>hbO(YEB$j)4VgU%Wr^z6J%s z9J_gi%!Pv)5GYIe*-^O2JO!~W(E$v|P zC#X*HFQ*}T#_%{$9)2F7`zI_{Te?+dQd5JxOV_436cU-tU^LV?;Ss#yx&aj|pdzwMj{q0o zKI0cl)L^@Do!^sK{MMGjB3Ocvrj5}mk7zy@PV}zHMC*jNm5r0#*cPZ#@Z3-#n2K?l z@FLJ)-lE}Y&dF03vO-)l)$VgVKY640D>vjO?stZU()LKWq{zkR4qUs& z`&mQljEscvVdOJ*h-qe`7W(%|Qq4;hH(P%DKF!2*a#(Z{?uMIZ>U=>8bTSEKwE12U zK-V6oqaz;(Mb%Ncp^Uy*ZCKMIW_9xzg6cRbz5u>h@f{l1G|w3Ct+vaGZ7{P z-ucoJg4h+NRv6ZgQeLRW&(hB_t)L~!-5<$eGj*{aRdIDQ!1gj>!n4)=+Ru|k{>vaA z)$b-u@UK#hzqW!*&5PafvKCN~kd##J1~Q-#=z*5Xlp`qw5R^}b{UBbkj)=I;F7}OD z1&rryv_M9t5;cli%VoRA?dj^=?I77(Nf<#G0c`quJl%eczEs1r0TTx>9}Q~AE26}a z)?2t64|h2(^zyJ+Uzg&fJh29r^_m->bl7V z%rK%`{e&8!Y~4(;MV`j>!&9LS1db9OqD!tpW97w;gfbG0t-UlxGA}vQGAByEYf3LrD%YcgVlN$9An=|Ix$fB@cIc_R5K9w26H1ZeT|UI zxu-YHGT{AT9GZpC+UTv%A0Y=SkN30C&ls=&a#Q@)=~Q+!v-~UIkf>tjh^311I525S zY=mggZ*MtgA%?VIXKIv0tn` zK8$nG-8K55+Jx)c9%FY^%LbpLWOWYr&Y^!f(&y?;H*vcQ^0Ns#r_u3#9igbtuFnNO z;1AV-)bFlh!`*>3;K1b*4L*7FaL13%3$vBs7Y^l3Ou(#{67-s!AZDM7nt_X>DFA4Bd>3uqCV+$`2yHyZi7#mtk{sFTR}5#P#t7s7a6rRC0n^=j0;VA zSnOpwLHcK9QC_8gK@wFLQ{vUGb{b@$R`hdJ>KRTbD=@h+1BGkkv2*;I&sui9&CIkE zZ*SH6@#a!mxzTE5Rn(=ST<#D@%P_WL{O~;$LDm^K(6&zEI6PyPX9_?;rY&JyBS%Dt?D`t^ntaoO+CX!y8 z^D&>hF&QV=?MRIbrAKKN?`cP8h?fuiA9TnwvHiak;4%1l=9h-cXf60C0l zMF~$x2LDg%r39uW8oB{ zH$JZJo8(mulufF1$T>R6mIn}Zth!}CUZ9Xz;vrNJZp$_AvlcLuoZAL2w+eM?pgM#0 zs!Z#aa73M+PELvFj7;dr5XWauw<_`DWzE7ciNh-NsgzG%G9T*pp_4^&)#oyShbwXr zaTh8!2?TCV!_ehXl$jP?bAvUW7rO$!uhyV+KO;c#-_Z~D!z;Uk^e$a@L*eZu0p(S- z!=Nj^1NAQ1RAnz)pQGHh74N5pQbJYFu{gje9gmOt0jDhOky zY4lpB?3qW4`_>-8CL{r&KGCWb8vE5{W)U`fYipr)*di4-b@Mn8!_Nl%>GHys<(a8~h<=(v($HE+hAQYg+?gWbDHMlC{5Ky`W3#T^^48g|jF9*pIfdG$QW(sBw zNdyM!q|B~wIhe`3M&e2$3~=M|_QA|}0|7{hH4$DdVqPGmB4C0R{%GVQE@2gzEgQe< zygng}O8E)=<`Dc)Z(?cr3SScziSZggIKr}jCXkKT{D-+U;wbvjKtw->m_7KsPR8J~ z6%rv-XMYl*wJuCdG*dJLm@808HF-bI;6$N=c+GUW44YOEa=Y!zh1gHSEG~kG9fF9&SzpIaf%td(PNJPwq#y|RMnO6K(tOsx_3wSZ$9YEj} zHNo>rd(KrJqq|w*fx;W`;P3hqCz>3#0Nui$UUz|s@eDF8FJhO`>7VRK+$2u$$fK;$ zlLoM~aekbI=p(}2^gL6c0i@wos9NQYpeN`awG zq}vO}?rWC7EqHk^9z}{z-eQML!I=rvlM~d5Zom*xz7`!Ox$sTcb_yTrRL>nGIy*%M zlP^Zz4E(9iHhDWxKnJv2Ea?$Mf4-tR@gOFMb&k9*$qJvppWhYgY@EcEn!DY+2t5o& zWP=M$iX2X8r;3w*G5p6z$8~oIH@Y~Sp2(Ug_-1RyY7Q2R<%G0^)&-w%-x1-jE-iO( zfUC-2#cGSbd8ROJX(Z_uA$1FN%zogui%8rej=SauX>dlC+HxVEH8hSpAvV{PSsT`2 zLiN&d`v$q!ffmNvfNS7}fj*OzXSexjrtel0ytji5<#3Gi#l224H&-`>)E=k1*h*K% z;O0ZAQ%&J~8*JKN@F1RXoln*_sg1LQ+%&AF95Tc56?KJ^ERBBc@HRsp>*&Vw3>G}Z zLP0w5yx|VnEm5DBrfKX6@5Oan8XP+Xga7~lMfg=L>$jz2MlVU2UzCn9{m%FMlYx+t zfs@G(37yE;5s6+tMLr7ZO=U&dMRe> zOz>bAoX%dltxuP)!5wE&V@KrJuRQ5^4Cc!pEAKN)Sj641>xUYq&pho`TWvzmhRvLm zv%8#Hq{*(fd8BtYvFHdNg3xR`=OUZ1?(FuP7@`+lw74L6cggZ*jxvU0x+0=N#!+0F zHAV>8@;>{Oz!-~@)5uI;8(JZzCiBxd_NS8NO87@P9q4uU)q(;GqK2Uxs6C<4^v>rz z2_LC6C8Uic6kfYG%=S@oE8<>#&Yj39yoyRYmMr_2j$XKsx5BdHq#=1jmC}9#t*z294@H9axt)A<}|6#r$3yG+fI%s#g#sb>y8a$ zt8LDzyFi-jxQ%VfjVb#}$DFQDhZlHtNFu#^%!zM==JH4Tcjxn3@R$0_13+xy{LA_f z*heb8dLd}AS8udmPiBTWuTk%nMai=smcfKsF9p@fPmG#-XZ!A8_!0JTbC{?|n?!bJ zOQ2!oM=tWrgrR;ct(jq8WIB9(pCugYD^QWIDco*tzxGN(roSGe5ZYL}jFnoGYNk|1 zn~o!`-KW@!m3nWK(?)4KKqyYk$@t@*+h@6jQA2c@f>vpy+9h=&?cs9+dCK>X=*P(e@l#sw2mn(-gho2Y0zS`R0vD6p2NJ3JO8vjIly%|dT{}jx3364fC38Tjw005 z98MBc^3?2ypM;_{nD2)yf^pyWVf6KU^}Z85%==S5;t>2upl)`q1@8+~Q=@vY=_{H8UL+HWCho~UUTSLdCjjvDHR)$YChk8Q>9HpUGbhGSJ)++}5nlpdkS0?}uD!TTGbkGM8K%2&8LjsYR0fg17VZO2 ze)3sLf~Nr8K1GsT7m+1oU#RgVt3j5|d4e3bq>XLJdLhLkGzYqV=LB9~1Y$w9q7{K| ziw3bWAj0rsY;bn_VhoKR}dyO zweZh-&Gfn0Nlp?F2nyhz`!SyF?ho{zo{K-bGyZwxOMk|9`YDh7E0Hh#8sACr`SCv@ zpW8hC>fZQgu`m4_-^us+@#oP$baVVOo0oo$@6`1C_>XMx0_sb>yW2E}0h4EvC?d5d; zPD=j+*Y8=&pRxEcvGkIs`%d+k|6c3AXYGEL@naU{B}Mg}aIpWqjDJX2{VeRq(4gWn&^RuiUgXn+XSx|WYUe@1|6F-aiG3@&ijsH&8_`ebH|HbBi=J{io z^Ce*Xo$v^M!}IUqz_BCpVj=) zmwvf4eJ3pHf5q_UE7Z>desmuGzG-ovjr%V({;v+YoFwS88v+1;@%-_H004+$c=`4J E0N_J?K>z>% literal 0 HcmV?d00001 diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java index 0f9fd82a04..48a5cfc09a 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java @@ -83,7 +83,7 @@ public static void initClass() { @Test public void importPriKeyTest() { - //importPriKey("b54db432bba7e13a6c4a28f65b925b18e63bcb79143f7b894fa735d5d3d09db5", password);//打包地址 tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp + importPriKey("b54db432bba7e13a6c4a28f65b925b18e63bcb79143f7b894fa735d5d3d09db5", password);//打包地址 tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp //importPriKey("188b255c5a6d58d1eed6f57272a22420447c3d922d5765ebb547bc6624787d9f", password);//打包地址 tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe importPriKey("fbcae491407b54aa3904ff295f2d644080901fda0d417b2b427f5c1487b2b499", password);//打包地址 tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF @@ -322,7 +322,7 @@ private Map makeAccountContractsParams(String address, int pageNumber, int pageS */ @Test public void contractInfo() throws Exception { - Map params = this.makeContractInfoParams("tNULSeBaN6GoEavdatSmFy6mzb88oNupqosF91"); + Map params = this.makeContractInfoParams("tNULSeBaN4aTDUzAan3NmoAfyc1tTxsmp7ksZC"); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CONTRACT_INFO, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CONTRACT_INFO)); Log.info("contract_info-result:{}", JSONUtils.obj2PrettyJson(cmdResp2)); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java index 1d647d457f..785793a88a 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java +++ b/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java @@ -50,8 +50,16 @@ */ public class ContractCreateSendTxTest extends BaseQuery { - String contractA = "tNULSeBaMwJNC9FUQbiTk2mnCLqYSnF1Ub7nt5"; + String contractA = "tNULSeBaN7MCLavwRjJqH28w9NCmahUbybYC6K"; + @Test + public void createNRC1155() throws Exception { + InputStream in = new FileInputStream("/Users/pierreluo/IdeaProjects/NULS-NRC1155Demo/target/NULS-NRC1155Demo-1.0-SNAPSHOT.jar"); + byte[] contractCode = IOUtils.toByteArray(in); + String remark = "create 1155 A"; + String create = this.invokeCreate(sender, contractCode, "test_c", remark, "asdasdasd3", "name1155", "SYMBOL1155v6"); + System.out.println(create); + } @Test public void createAndInit() throws Exception { this.contractA = createContractA(); @@ -60,8 +68,17 @@ public void createAndInit() throws Exception { @Test public void testCreate() throws Exception { - Map resultA = this.invokeCall(sender, null, contractA, "createContract", null, null, - new String[]{"tNULSeBaMy3Tw7pHNDYwSMaewDypQMdNywXXUJ", "tccc5", "777"}); + contractA = "tNULSeBaMznzh3a6QZedEABuMiydtN4QgV7Euh"; + Map resultA = this.invokeCall(sender, null, contractA, "createContract4", null, null, + new String[]{"tNULSeBaN7MCLavwRjJqH28w9NCmahUbybYC6K", "2"}); + resultCheck(resultA); + } + + @Test + public void testInnerCallForCreate() throws Exception { + contractA = "tNULSeBaMznzh3a6QZedEABuMiydtN4QgV7Euh"; + Map resultA = this.invokeCall(sender, null, contractA, "innerCall", null, null, + new String[]{"tNULSeBaN8w6ivxm6nqPMrUVV5hp1gVVd3HpDA", "tccc9"}); resultCheck(resultA); } @@ -81,7 +98,8 @@ public void testASD() throws Exception { @Test public void invokeViewTest() throws Exception { - String view = this.invokeView(contractA, "codeHash", List.of("tNULSeBaN1yJ1rZmwCwGjoRs86cajmbBWZ6he5")); + contractA = "tNULSeBaMznzh3a6QZedEABuMiydtN4QgV7Euh"; + String view = this.invokeView(contractA, "decimals", 2, 1); System.out.println(view); } diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java b/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java index 0080971acc..6c36e3df0d 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java +++ b/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java @@ -20,6 +20,10 @@ package io.nuls.transaction.tx; +import io.nuls.base.signture.TransactionSignature; +import io.nuls.core.crypto.HexUtil; +import org.junit.Test; + import java.util.ArrayList; import java.util.List; @@ -151,4 +155,12 @@ public static void main(String[] args) throws Exception { list.add("NULSd6HgUxiPz3EMdZSuMHZf1caN8dVYCxRJx 3885 690661d1d5fc58bfbbdfa90f5874382b0f12ac5aa5382639bb956c14961236b6"); list.add("NULSd6HgdwgigpqWvDBjt5ptPeioGsp49fTbp 2775 ddbcd47c767df7f89fa42412e9bf9105d498b452e6076852795b1590654473b5"); */ + + @Test + public void signData() throws Exception { + String txSign = "210232bdaf6573319eba3b433ed88d6d4b0d06ea3ad9a504596fe967a2dbf95fc07c473045022100f4e1f683803a103b79eeb420a6d04089a673f93b2ea3d3012508320846f91c5302205c133ff512d6865fcb47c7fe07c7d930dfe6857cd5d69ab8065609435929a439"; + TransactionSignature sign = new TransactionSignature(); + sign.parse(HexUtil.decode(txSign),0); + System.out.println(HexUtil.encode(sign.getP2PHKSignatures().get(0).getPublicKey())); + } } diff --git a/version b/version index a103f3a143..79a00e9a07 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.14.0-beta \ No newline at end of file +2.16.0 \ No newline at end of file From ddfb04681e7792f38fda9a020008a18a8bae345a Mon Sep 17 00:00:00 2001 From: "lijun.zhou" Date: Thu, 20 Jul 2023 10:30:57 +0800 Subject: [PATCH 11/75] Cross-chain transactions with a high lag of more than one day are no longer broadcast --- .../crosschain/nuls/servive/impl/BlockServiceImpl.java | 9 ++++++--- .../java/io/nuls/crosschain/nuls/utils/TxUtil.java | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java index cb2febc00c..88de88f9a0 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java @@ -130,9 +130,12 @@ public Result newBlockHeight(Map params) { } } if(broadFailCtxHash.size() > 0){ - po.setHashList(broadFailCtxHash); - sendHeightService.save(cacheHeight, po, chainId); - chain.getLogger().error("区块高度为{}的跨链交易广播失败",cacheHeight); + int ONE_DAY_HEIGHT = 360 * 24; + if(height - cacheHeight < ONE_DAY_HEIGHT){ + po.setHashList(broadFailCtxHash); + sendHeightService.save(cacheHeight, po, chainId); + chain.getLogger().error("区块高度为{}的跨链交易广播失败",cacheHeight); + } }else{ sendHeightService.delete(cacheHeight, chainId); chain.getLogger().info("区块高度为{}的跨链交易广播成功",cacheHeight); diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java index c3ec6a7a90..c634ddabaf 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java @@ -380,6 +380,16 @@ public static void handleNewCtx(Transaction ctx, Chain chain, List cance if (sign && cancelList != null) { sign = !cancelList.contains(address); } + chain.getLogger().debug("sign:{}",sign); + if(!sign){ + chain.getLogger().debug("address:{}",address); + chain.getLogger().info("verifierList size:{}",verifierList.size()); + if(verifierList != null){ + verifierList.forEach(d->{ + chain.getLogger().info("{}",d); + }); + } + } if (sign) { chain.getLogger().info("本节点为共识节点，对跨链交易签名,Hash:{}", hashHex); TransactionSignature signature = new TransactionSignature(); From 9d68c2bd32a183ae81e559a056882071d86c1ebf Mon Sep 17 00:00:00 2001 From: "lijun.zhou" Date: Thu, 20 Jul 2023 10:32:34 +0800 Subject: [PATCH 12/75] Cross-chain transactions with a high lag of more than one day are no longer broadcast --- .../io/nuls/crosschain/nuls/utils/TxUtil.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java index c634ddabaf..dea5c7ebeb 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java +++ b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java @@ -380,16 +380,16 @@ public static void handleNewCtx(Transaction ctx, Chain chain, List cance if (sign && cancelList != null) { sign = !cancelList.contains(address); } - chain.getLogger().debug("sign:{}",sign); - if(!sign){ - chain.getLogger().debug("address:{}",address); - chain.getLogger().info("verifierList size:{}",verifierList.size()); - if(verifierList != null){ - verifierList.forEach(d->{ - chain.getLogger().info("{}",d); - }); - } - } +// chain.getLogger().debug("sign:{}",sign); +// if(!sign){ +// chain.getLogger().debug("address:{}",address); +// chain.getLogger().info("verifierList size:{}",verifierList.size()); +// if(verifierList != null){ +// verifierList.forEach(d->{ +// chain.getLogger().info("{}",d); +// }); +// } +// } if (sign) { chain.getLogger().info("本节点为共识节点，对跨链交易签名,Hash:{}", hashHex); TransactionSignature signature = new TransactionSignature(); From 7c2909706eb95c6b99e1ed7bff2f78e8f9429388 Mon Sep 17 00:00:00 2001 From: Niels Date: Wed, 11 Oct 2023 12:06:23 +0800 Subject: [PATCH 13/75] Pre master 1011 (#694) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/beta (#652) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cro… * Prod 19 (#653) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ch… * Develop add api (#654) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * 提交协议升级配置 * update block * update pom * update test case * 提交12协议升级配置--允许资产重新注册跨链 * 恢复transfer * update test case * add api for block account Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/pre prod (#655) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod 1.12.1 (#656) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#657) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#658) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#659) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * 2.12.5 (#660) * 2.12.3 * 2.12.3 * 2.12.5 * Release/pre prod -- 2.13.0 (#661) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ab… * Release/pre prod (#662) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * cmd client add command (#664) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * remove dependency-fastjson --- v2.13.1 (#671) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * 2.14.0 (#674) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * 2.15.0 (#677) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Release/pre prod (#680) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#682) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Pre prod codehash (#685) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 toke… * 2.16.0 (#689) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Fix crosschain (#692) * Cross-chain transactions with a high lag of more than one day are no longer broadcast * Cross-chain transactions with a high lag of more than one day are no longer broadcast * merge init * merge coding * merge coding * cmd annotation * remove nrc20 record * block save bug * module transaction group * test settings * test case * load file bug * log trace * txs commit bug * log trace * bug about cross chain duplication commit * bug for duplication commit * cross chain bug * log trace * remove log trace * merge version * merge version * merge version * merge version * cmd bug * merge version * merge version * test case * add logs * add logs * add logs * change name of the duplicate cmd * merge modules * merge modules --------- Signed-off-by: dependabot[bot] Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- README.md | 3 +- build/package-base.ncf | 13 +- .../io/nuls/base/protocol/ModuleHelper.java | 6 +- .../base/protocol/ProtocolGroupManager.java | 14 +- .../base/protocol/cmd/CommonProtocolCmd.java | 3 + .../base/protocol/cmd/MessageDispatcher.java | 3 + .../protocol/cmd/TransactionDispatcher.java | 86 +- .../main/java/io/nuls/base/data/CoinFrom.java | 2 +- .../core/rockdb/manager/RocksDBManager.java | 4 + .../io/nuls/core/rpc/model/InvokeBean.java | 52 +- .../java/io/nuls/core/rpc/model/ModuleE.java | 5 +- .../io/nuls/core/rpc/model/NulsCoresCmd.java | 15 + .../rpc/modulebootstrap/ModuleStatusCmd.java | 3 + .../processor/RequestMessageProcessor.java | 8 +- .../processor/ResponseMessageProcessor.java | 53 +- .../nuls/core/rpc/util/LocalModuleCall.java | 52 ++ .../io/nuls/core/constant/BaseConstant.java | 5 + .../io/nuls/core/core/annotation/Order.java | 5 + .../core/core/config/ConfigurationLoader.java | 20 + .../nuls/core/core/ioc/SpringLiteContext.java | 15 +- .../src/main/java/io/nuls/core/log/Log.java | 16 +- .../io/nuls/core/log/logback/NulsLogger.java | 12 +- .../java/io/nuls/core/model/DoubleUtils.java | 2 +- config/nuls.beta.ncf | 2 +- config/nuls.ncf | 2 +- module.ncf | 24 +- module/nuls-account/module.ncf | 16 - module/nuls-account/pom.xml | 52 -- .../io/nuls/account/config/AccountConfig.java | 148 --- .../nuls/account/rpc/call/ContractCall.java | 67 -- .../nuls/account/storage/ConfigService.java | 75 -- .../storage/impl/ConfigServiceImpl.java | 105 --- .../account/util/manager/ConfigManager.java | 87 -- .../main/resources/languages/en.properties | 57 -- .../src/main/resources/module.json | 12 - .../src/main/resources/protocol-config.json | 86 -- module/nuls-api/module.ncf | 2 +- .../java/io/nuls/provider/ApiBootstrap.java | 19 +- module/nuls-block/module.ncf | 13 - module/nuls-block/pom.xml | 50 - .../java/io/nuls/block/model/BlockConfig.java | 177 ---- .../io/nuls/block/model/ChainParameters.java | 464 ---------- .../storage/ParametersStorageService.java | 105 --- .../impl/ParametersStorageServiceImpl.java | 150 --- .../main/resources/languages/en.properties | 18 - .../nuls-block/src/main/resources/module.json | 29 - .../src/main/resources/protocol-config.json | 51 -- .../nuls/block/model/ChainParametersTest.java | 22 - module/nuls-chain-manager/.gitignore | 118 --- module/nuls-chain-manager/module.ncf | 14 - module/nuls-chain-manager/pom.xml | 48 - module/nuls-chain-manager/readme.md | 59 -- .../io/nuls/chain/config/NulsChainConfig.java | 280 ------ .../main/resources/languages/en.properties | 42 - .../src/main/resources/module.json | 22 - .../src/main/resources/protocol-config.json | 168 ---- module/nuls-cmd-client/module.ncf | 4 +- .../io/nuls/cmd/client/CmdClientModule.java | 13 +- .../processor/transaction/GetTxProcessor.java | 2 +- .../economic-model/base-economic/pom.xml | 17 - .../test/java/io/nuls/provider/AppTest.java | 20 - .../economic-model/nuls-economic/pom.xml | 25 - .../test/java/io/nuls/provider/AppTest.java | 20 - module/nuls-consensus/economic-model/pom.xml | 20 - .../nuls-consensus-poc/module.ncf | 13 - .../nuls-consensus/nuls-consensus-poc/pom.xml | 27 - .../java/io/nuls/poc/ConsensusBootStrap.java | 198 ---- .../io/nuls/poc/constant/ConsensusConfig.java | 110 --- .../nuls/poc/model/bo/config/ConfigBean.java | 433 --------- .../nuls/poc/model/bo/config/ConfigItem.java | 46 - .../io/nuls/poc/storage/ConfigService.java | 51 -- .../poc/storage/impl/ConfigServiceImpl.java | 85 -- .../nuls/poc/tx/ProtocolUpgradeInvoker.java | 32 - .../nuls/poc/utils/manager/ConfigManager.java | 63 -- .../main/resources/languages/en.properties | 44 - .../src/main/resources/module.json | 18 - .../src/main/resources/protocol-config.json | 254 ------ .../nuls/test/storage/ConfigStorageTest.java | 67 -- module/nuls-consensus/pom.xml | 19 - module/nuls-consensus/readme.md | 29 - .../Module documentation is all here.txt | 0 .../documents/account}/account.md | 0 .../documents/account}/account_design.md | 0 .../account}/img/account-context.png | Bin .../account}/img/account-functions.png | Bin .../documents/account}/img/account-module.png | Bin .../documents/account}/readme.md | 0 .../Module documentation is all here.txt | 0 .../documents/block}/block.md | 0 .../documents/block}/readme.md | 0 .../Module documentation is all here.txt | 0 .../documents/chain}/chain-manager.md | 0 .../Module documentation is all here.txt | 0 .../documents/consensus}/consensus.md | 0 .../image/consensus-module/coinbase.png | Bin .../consensus-module/consensus-constants.jpg | Bin .../consensus-module/consensus-flow-5.png | Bin .../image/consensus-module/consensus-func.png | Bin .../consensus-staticsReward.jpg | Bin .../image/consensus-module/statics_en.png | Bin ...45\235\227\350\256\276\350\256\241v1.3.md" | 0 .../documents/consensus}/readme.md | 0 .../Module documentation is all here.txt | 0 .../documents/contract}/readme.md | 0 .../documents/contract}/smart-contract.md | 0 .../documents/crosschain}/cross-chain.md | 0 .../cross-chain/Main-Parallel-Ctx.jpg | Bin .../cross-chain/MainNet-VerifierChange.jpg | Bin .../cross-chain/Parallel-Main-Ctx.jpg | Bin .../cross-chain/Parallel-Parallel-Ctx.jpg | Bin .../cross-chain/Parallel-VerifierChange.jpg | Bin .../crosschain}/cross-chain/Verifire.jpg | Bin .../crosschain}/cross-chain/VerifireInit.jpg | Bin .../crosschain}/cross-chain/VerifireInit.png | Bin .../cross-chain/cross_chain_functions.png | Bin ...45\235\227\350\256\276\350\256\241v1.3.md" | 0 .../documents/crosschain}/readme.md | 0 .../Module documentation is all here.txt | 0 .../documents/ledger}/README.md | 0 .../documents/ledger}/ledger.md | 0 .../Module documentation is all here.txt | 0 .../documents/network}/network.md | 0 .../documents/network}/readme.md | 0 .../Module documentation is all here.txt | 0 .../documents/protocol}/readme.md | 0 .../Module documentation is all here.txt | 0 .../transaction}/img/architecture.png | Bin .../img/functional-architecture.png | Bin .../documents/transaction}/img/new-tx.png | Bin .../documents/transaction}/readme.md | 0 .../documents/transaction}/transaction.md | 0 .../transaction}/transaction_design.md | 0 module/nuls-cores/module.ncf | 10 + .../pom.xml | 93 +- .../main/java/io/nuls/NulsCoresBootstrap.java | 286 ++++++ .../io/nuls/account/AccountBootstrap.java | 99 +- .../io/nuls/account/config/NulsConfig.java | 0 .../account/constant/AccountConstant.java | 0 .../account/constant/AccountErrorCode.java | 0 .../constant/AccountStorageConstant.java | 0 .../io/nuls/account/constant/RpcConstant.java | 0 .../constant/RpcParameterNameConstant.java | 0 .../account/helper/AccountBlockHelper.java | 4 +- .../helper/AccountContractCallHelper.java | 4 +- .../io/nuls/account/model/NonceBalance.java | 0 .../io/nuls/account/model/bo/Account.java | 0 .../account/model/bo/AccountKeyStore.java | 0 .../nuls/account/model/bo/AccountStatus.java | 0 .../java/io/nuls/account/model/bo/Chain.java | 2 +- .../nuls/account/model/bo/VerifyTxResult.java | 0 .../model/bo/tx/AccountBlockExtend.java | 0 .../account/model/bo/tx/AccountBlockInfo.java | 0 .../account/model/bo/tx/AliasTransaction.java | 0 .../model/bo/tx/txdata/AccountBlockData.java | 0 .../bo/tx/txdata/AccountContractCallData.java | 0 .../account/model/bo/tx/txdata/Alias.java | 0 .../account/model/dto/AccountBlockDTO.java | 0 .../io/nuls/account/model/dto/AccountDTO.java | 0 .../account/model/dto/AccountKeyStoreDTO.java | 0 .../account/model/dto/AccountOfflineDTO.java | 0 .../nuls/account/model/dto/BaseCoinDTO.java | 0 .../io/nuls/account/model/dto/CoinDTO.java | 0 .../model/dto/MultiSignCoinFromDTO.java | 0 .../account/model/dto/MultiSignCoinToDTO.java | 0 .../dto/MultiSignTransactionResultDTO.java | 0 .../model/dto/MultiSignTransferDTO.java | 0 .../account/model/dto/SimpleAccountDTO.java | 0 .../nuls/account/model/dto/TransferDTO.java | 0 .../model/po/AccountBlockExtendPO.java | 0 .../nuls/account/model/po/AccountBlockPO.java | 0 .../model/po/AccountContractCallPO.java | 0 .../io/nuls/account/model/po/AccountPO.java | 0 .../io/nuls/account/model/po/AliasPO.java | 0 .../account/model/po/MultiSigAccountPO.java | 0 .../nuls/account/model/vo/AccountBlockVO.java | 0 .../io/nuls/account/rpc/call/EventCall.java | 0 .../io/nuls/account/rpc/call/LedgerCall.java | 0 .../account/rpc/call/TransactionCall.java | 0 .../nuls/account/rpc/cmd/AccountBlockCmd.java | 1 + .../io/nuls/account/rpc/cmd/AccountCmd.java | 1 + .../account/rpc/cmd/AcmTransactionCmd.java} | 3 +- .../account/rpc/cmd/AddressPrefixCmd.java | 1 + .../io/nuls/account/rpc/cmd/AliasCmd.java | 1 + .../account/rpc/cmd/MultiSignAccountCmd.java | 1 + .../account/service/AccountCacheService.java | 0 .../service/AccountKeyStoreService.java | 0 .../nuls/account/service/AccountService.java | 0 .../io/nuls/account/service/AliasService.java | 0 .../io/nuls/account/service/ChainService.java | 0 .../service/MultiSignAccountService.java | 0 .../account/service/TransactionService.java | 0 .../impl/AccountKeyStoreServiceImpl.java | 0 .../service/impl/AccountServiceImpl.java | 8 - .../service/impl/AliasServiceImpl.java | 0 .../service/impl/ChainServiceImpl.java | 0 .../impl/MultiSigAccountServiceImpl.java | 0 .../service/impl/TransactionServiceImpl.java | 0 .../storage/AccountBlockStorageService.java | 0 ...rTransferOnContractCallStorageService.java | 0 .../storage/AccountStorageService.java | 0 .../account/storage/AliasStorageService.java | 0 .../MultiSigAccountStorageService.java | 0 .../impl/AccountBlockStorageServiceImpl.java | 0 ...nsferOnContractCallStorageServiceImpl.java | 0 .../impl/AccountStorageServiceImpl.java | 0 .../storage/impl/AliasStorageServiceImpl.java | 10 + .../MultiSigAccountStorageServiceImpl.java | 0 .../io/nuls/account/tx/v1/AliasProcessor.java | 0 .../nuls/account/tx/v1/TransferProcessor.java | 0 .../tx/v11/AccountLockProcessorV11.java | 0 .../tx/v11/AccountUnlockProcessorV11.java | 0 .../tx/v12/AccountLockProcessorV12.java | 0 ...ForTransferOnContractCallProcessorV13.java | 0 .../io/nuls/account/util/AccountTool.java | 0 .../java/io/nuls/account/util/LoggerUtil.java | 0 .../io/nuls/account/util/Preconditions.java | 0 .../java/io/nuls/account/util/TxUtil.java | 0 .../account/util/manager/ChainManager.java | 50 +- .../account/util/validator/TxValidator.java | 0 .../java/io/nuls/block/BlockBootstrap.java | 88 +- .../nuls/block/constant/BlockErrorCode.java | 0 .../nuls/block/constant/BlockForwardEnum.java | 0 .../io/nuls/block/constant/ChainTypeEnum.java | 0 .../nuls/block/constant/CommandConstant.java | 0 .../java/io/nuls/block/constant/Constant.java | 5 - .../block/constant/LocalBlockStateEnum.java | 0 .../java/io/nuls/block/constant/NodeEnum.java | 0 .../io/nuls/block/constant/StatusEnum.java | 0 .../nuls/block/manager/BlockChainManager.java | 0 .../io/nuls/block/manager/ChainManager.java | 2 - .../io/nuls/block/manager/ContextManager.java | 4 +- .../io/nuls/block/message/BlockMessage.java | 0 .../nuls/block/message/CompleteMessage.java | 0 .../nuls/block/message/HashListMessage.java | 0 .../io/nuls/block/message/HashMessage.java | 0 .../io/nuls/block/message/HeightMessage.java | 0 .../block/message/HeightRangeMessage.java | 0 .../nuls/block/message/SmallBlockMessage.java | 0 .../io/nuls/block/message/TxGroupMessage.java | 0 .../block/message/handler/BlockHandler.java | 0 .../message/handler/CompleteHandler.java | 0 .../handler/ForwardSmallBlockHandler.java | 0 .../handler/GetBlockByHeightHandler.java | 0 .../message/handler/GetBlockHandler.java | 0 .../message/handler/GetBlocksHandler.java | 0 .../message/handler/GetSmallBlockHandler.java | 0 .../message/handler/GetTxGroupHandler.java | 0 .../message/handler/SmallBlockHandler.java | 4 +- .../block/message/handler/TxGroupHandler.java | 0 .../block/model/BlockDownloaderParams.java | 0 .../io/nuls/block/model/CachedSmallBlock.java | 0 .../main/java/io/nuls/block/model/Chain.java | 0 .../io/nuls/block/model/ChainContext.java | 10 +- .../java/io/nuls/block/model/CheckResult.java | 0 .../io/nuls/block/model/GenesisBlock.java | 3 +- .../main/java/io/nuls/block/model/Node.java | 0 .../io/nuls/block/model/RollbackInfoPo.java | 0 .../java/io/nuls/block/model/TxGroupTask.java | 0 .../java/io/nuls/block/rpc/BlockResource.java | 1 + .../io/nuls/block/rpc/call/ConsensusCall.java | 0 .../io/nuls/block/rpc/call/ContractCall.java | 0 .../nuls/block/rpc/call/CrossChainCall.java | 4 +- .../io/nuls/block/rpc/call/NetworkCall.java | 0 .../io/nuls/block/rpc/call/ProtocolCall.java | 0 .../nuls/block/rpc/call/TransactionCall.java | 0 .../io/nuls/block/service/BlockService.java | 0 .../block/service/impl/BlockServiceImpl.java | 9 +- .../block/storage/BlockStorageService.java | 0 .../block/storage/ChainStorageService.java | 0 .../block/storage/RollbackStorageService.java | 0 .../storage/impl/BlockStorageServiceImpl.java | 0 .../storage/impl/ChainStorageServiceImpl.java | 0 .../storage/impl/RollbackServiceImpl.java | 0 .../io/nuls/block/test/BlockGenerator.java | 0 .../io/nuls/block/thread/BlockConsumer.java | 0 .../io/nuls/block/thread/BlockDownloader.java | 4 +- .../nuls/block/thread/BlockSynchronizer.java | 14 +- .../block/thread/monitor/BaseMonitor.java | 0 .../thread/monitor/ForkChainsMonitor.java | 4 +- .../thread/monitor/NetworkResetMonitor.java | 4 +- .../block/thread/monitor/NodesMonitor.java | 4 +- .../monitor/OrphanChainsMaintainer.java | 4 +- .../thread/monitor/OrphanChainsMonitor.java | 0 .../thread/monitor/StorageSizeMonitor.java | 4 +- .../thread/monitor/TxGroupRequestor.java | 0 .../java/io/nuls/block/utils/BlockUtil.java | 8 +- .../io/nuls/block/utils/ChainGenerator.java | 4 +- .../io/nuls/block/utils/ConfigLoader.java | 20 +- .../java/io/nuls/block/utils/LoggerUtil.java | 0 .../nuls/block/utils/SingleBlockCacher.java | 0 .../io/nuls/block/utils/SmallBlockCacher.java | 4 +- .../io/nuls/chain/ChainManagerBootstrap.java | 139 +-- .../java/io/nuls/chain/info/CmConstants.java | 0 .../java/io/nuls/chain/info/CmErrorCode.java | 0 .../io/nuls/chain/info/CmRuntimeInfo.java | 0 .../java/io/nuls/chain/info/RpcConstants.java | 0 .../nuls/chain/model/dto/AccountBalance.java | 0 .../io/nuls/chain/model/dto/AssetDto.java | 0 .../model/dto/ChainAssetTotalCirculate.java | 0 .../io/nuls/chain/model/dto/ChainDto.java | 0 .../chain/model/dto/ChainEventResult.java | 0 .../nuls/chain/model/dto/CoinDataAssets.java | 0 .../io/nuls/chain/model/dto/RegAssetDto.java | 0 .../io/nuls/chain/model/dto/RegChainDto.java | 0 .../java/io/nuls/chain/model/dto/Seed.java | 0 .../java/io/nuls/chain/model/po/Asset.java | 0 .../io/nuls/chain/model/po/BlockChain.java | 0 .../io/nuls/chain/model/po/BlockHeight.java | 0 .../io/nuls/chain/model/po/CacheDatas.java | 0 .../io/nuls/chain/model/po/ChainAsset.java | 19 + .../model/tx/AddAssetToChainTransaction.java | 0 .../nuls/chain/model/tx/BlockChainTxType.java | 0 .../tx/DestroyAssetAndChainTransaction.java | 0 .../tx/RegisterChainAndAssetTransaction.java | 0 .../tx/RemoveAssetFromChainTransaction.java | 0 .../nuls/chain/model/tx/txdata/TxAsset.java | 0 .../nuls/chain/model/tx/txdata/TxChain.java | 0 .../nuls/chain/model/tx/txdatav5/TxAsset.java | 0 .../nuls/chain/model/tx/txdatav5/TxChain.java | 0 .../io/nuls/chain/rpc/call/RpcService.java | 0 .../chain/rpc/call/impl/RpcServiceImpl.java | 0 .../java/io/nuls/chain/rpc/cmd/AssetCmd.java | 5 +- .../io/nuls/chain/rpc/cmd/BaseChainCmd.java | 0 .../io/nuls/chain/rpc/cmd/CmmChainCmd.java} | 8 +- .../io/nuls/chain/rpc/cmd/TxCirculateCmd.java | 1 + .../io/nuls/chain/service/AssetService.java | 0 .../nuls/chain/service/CacheDataService.java | 0 .../io/nuls/chain/service/ChainService.java | 0 .../nuls/chain/service/CmTransferService.java | 0 .../io/nuls/chain/service/MessageService.java | 0 .../chain/service/TxCirculateService.java | 0 .../nuls/chain/service/ValidateService.java | 0 .../chain/service/impl/AssetServiceImpl.java | 5 +- .../service/impl/CacheDataServiceImpl.java | 0 .../chain/service/impl/ChainServiceImpl.java | 6 +- .../chain/service/impl/CmTaskManager.java | 6 +- .../service/impl/CmTransferServiceImpl.java | 0 .../service/impl/MessageServiceImpl.java | 0 .../service/impl/TxCirculateServiceImpl.java | 6 +- .../service/impl/ValidateServiceImpl.java | 4 +- .../tx/v1/AddAssetTransferProcessor.java | 0 .../service/tx/v1/ChainAssetCommitAdvice.java | 0 .../tx/v1/ChainAssetRollbackAdvice.java | 0 .../tx/v1/DestroyChainTransferProcessor.java | 0 .../tx/v1/DisableAssetTransferProcessor.java | 0 .../tx/v1/RegChainTransferProcessor.java | 0 .../tx/v12/AddAssetTransferProcessor.java | 0 .../tx/v15/AddAssetTransferProcessor.java | 0 .../tx/v15/RegChainTransferProcessor.java | 0 .../tx/v5/AddAssetTransferProcessor.java | 0 .../tx/v5/DestroyChainTransferProcessor.java | 0 .../tx/v5/DisableAssetTransferProcessor.java | 0 .../tx/v5/RegChainTransferProcessor.java | 0 .../tx/v7/AddAssetTransferProcessor.java | 0 .../tx/v7/DestroyChainTransferProcessor.java | 0 .../tx/v7/DisableAssetTransferProcessor.java | 0 .../tx/v7/RegChainTransferProcessor.java | 0 .../io/nuls/chain/storage/AssetStorage.java | 0 .../chain/storage/BlockHeightStorage.java | 0 .../nuls/chain/storage/CacheDatasStorage.java | 0 .../nuls/chain/storage/ChainAssetStorage.java | 0 .../chain/storage/ChainCirculateStorage.java | 0 .../io/nuls/chain/storage/ChainStorage.java | 0 .../java/io/nuls/chain/storage/InitDB.java | 0 .../chain/storage/impl/AssetStorageImpl.java | 0 .../nuls/chain/storage/impl/BaseStorage.java | 0 .../storage/impl/BlockHeightStorageImpl.java | 0 .../storage/impl/CacheDatasStorageImpl.java | 0 .../storage/impl/ChainAssetStorageImpl.java | 0 .../impl/ChainCirculateStorageImpl.java | 0 .../chain/storage/impl/ChainStorageImpl.java | 0 .../nuls/chain/task/ChainAssetUpdateTask.java | 0 .../io/nuls/chain/util/ChainManagerUtil.java | 0 .../java/io/nuls/chain/util/LoggerUtil.java | 0 .../java/io/nuls/chain/util/ResponseUtil.java | 0 .../main/java/io/nuls/chain/util/TxUtil.java | 0 .../java/io/nuls/common/CommonContext.java} | 66 +- .../common/CommonVersionChangeInvoker.java} | 70 +- .../main/java/io/nuls/common/ConfigBean.java | 817 +++++++++++++++++ .../java/io/nuls/common/ConfigManager.java | 132 +++ .../io/nuls/common/INulsCoresBootstrap.java} | 64 +- .../java/io/nuls/common/NulsCoresConfig.java | 858 ++++++++++++++++++ .../io/nuls/consensus/ConsensusBootStrap.java | 114 +++ .../constant/ConsensusConstant.java | 2 +- .../constant/ConsensusErrorCode.java | 2 +- .../base/service/EconomicService.java | 2 +- .../nuls/constant/NulsEconomicConstant.java | 2 +- .../economic/nuls/constant/ParamConstant.java | 2 +- .../economic/nuls/model/bo/AgentInfo.java | 2 +- .../nuls/model/bo/ConsensusConfigInfo.java | 2 +- .../economic/nuls/model/bo/DepositInfo.java | 2 +- .../economic/nuls/model/bo/InflationInfo.java | 2 +- .../economic/nuls/model/bo/RoundInfo.java | 2 +- .../nuls/service/EconomicServiceImpl.java | 16 +- .../nuls/util/manager/EconomicManager.java | 12 +- .../nuls/consensus}/model/bo/BlockData.java | 2 +- .../io/nuls/consensus}/model/bo/Chain.java | 19 +- .../consensus}/model/bo/ChargeResultData.java | 4 +- .../model/bo/consensus/Evidence.java | 2 +- .../model/bo/round/MeetingMember.java | 6 +- .../model/bo/round/MeetingRound.java | 8 +- .../model/bo/round/RoundValidResult.java | 2 +- .../consensus}/model/bo/tx/txdata/Agent.java | 4 +- .../model/bo/tx/txdata/CancelDeposit.java | 2 +- .../model/bo/tx/txdata/DelayStopAgent.java | 4 +- .../model/bo/tx/txdata/Deposit.java | 2 +- .../model/bo/tx/txdata/RedPunishData.java | 2 +- .../model/bo/tx/txdata/StopAgent.java | 2 +- .../model/bo/tx/txdata/YellowPunishData.java | 2 +- .../consensus}/model/dto/CmdRegisterDto.java | 2 +- .../consensus}/model/dto/RandomSeedDTO.java | 2 +- .../model/dto/input/ContractAgentDTO.java | 2 +- .../model/dto/input/ContractDepositDTO.java | 2 +- .../model/dto/input/ContractStopAgentDTO.java | 2 +- .../model/dto/input/ContractWithdrawDTO.java | 2 +- .../model/dto/input/CreateAgentDTO.java | 2 +- .../model/dto/input/CreateDepositDTO.java | 2 +- .../model/dto/input/CreateMultiAgentDTO.java | 2 +- .../dto/input/CreateMultiDepositDTO.java | 2 +- .../model/dto/input/MultiWithdrawDTO.java | 2 +- .../model/dto/input/SearchAgentDTO.java | 2 +- .../model/dto/input/SearchAllAgentDTO.java | 2 +- .../dto/input/SearchContractAgentDTO.java | 2 +- .../dto/input/SearchContractDepositDTO.java | 2 +- .../model/dto/input/SearchDepositDTO.java | 2 +- .../model/dto/input/SearchPunishDTO.java | 2 +- .../model/dto/input/StopAgentDTO.java | 2 +- .../model/dto/input/StopMultiAgentDTO.java | 2 +- .../model/dto/input/ValidBlockDTO.java | 2 +- .../model/dto/input/WithdrawDTO.java | 2 +- .../dto/output/AccountConsensusInfoDTO.java | 2 +- .../consensus}/model/dto/output/AgentDTO.java | 6 +- .../model/dto/output/DepositDTO.java | 8 +- .../model/dto/output/PunishLogDTO.java | 6 +- .../dto/output/WholeNetConsensusInfoDTO.java | 2 +- .../model/dto/transaction/CoinDto.java | 2 +- .../model/dto/transaction/CoinFromDto.java | 2 +- .../model/dto/transaction/CoinToDto.java | 2 +- .../model/dto/transaction/TransactionDto.java | 2 +- .../io/nuls/consensus}/model/po/AgentPo.java | 2 +- .../nuls/consensus}/model/po/DepositPo.java | 2 +- .../nuls/consensus}/model/po/PunishLogPo.java | 2 +- .../consensus}/model/po/RandomSeedPo.java | 2 +- .../model/po/RandomSeedStatusPo.java | 2 +- .../consensus}/rpc/call/CallMethodUtils.java | 12 +- .../io/nuls/consensus}/rpc/cmd/AgentCmd.java | 8 +- .../io/nuls/consensus}/rpc/cmd/BlockCmd.java | 5 +- .../io/nuls/consensus}/rpc/cmd/ChainCmd.java | 16 +- .../rpc/cmd/ConsensusTransactionHandler.java | 7 +- .../consensus/rpc/cmd/CsmContractCmd.java} | 7 +- .../nuls/consensus}/rpc/cmd/DepositCmd.java | 8 +- .../nuls/consensus}/rpc/cmd/MultiSignCmd.java | 5 +- .../io/nuls/consensus}/rpc/cmd/RandomCmd.java | 9 +- .../nuls/consensus}/service/AgentService.java | 2 +- .../nuls/consensus}/service/BlockService.java | 2 +- .../nuls/consensus}/service/ChainService.java | 3 +- .../consensus}/service/ContractService.java | 2 +- .../consensus}/service/DepositService.java | 2 +- .../consensus}/service/MultiSignService.java | 2 +- .../service/impl/AgentServiceImpl.java | 50 +- .../service/impl/BlockServiceImpl.java | 20 +- .../service/impl/ChainServiceImpl.java | 34 +- .../service/impl/ContractServiceImpl.java | 46 +- .../service/impl/DepositServiceImpl.java | 35 +- .../service/impl/MultiSignServiceImpl.java | 34 +- .../service/impl/RandomSeedService.java | 12 +- .../storage/AgentStorageService.java | 4 +- .../storage/DepositStorageService.java | 4 +- .../storage/PunishStorageService.java | 4 +- .../storage/RandomSeedsStorageService.java | 6 +- .../storage/impl/AgentStorageServiceImpl.java | 9 +- .../impl/DepositStorageServiceImpl.java | 9 +- .../impl/PunishStorageServiceImpl.java | 9 +- .../impl/RandomSeedsStorageServiceImpl.java | 10 +- .../consensus}/tx/v1/CoinBaseProcessor.java | 10 +- .../tx/v1/ContractCreateAgentProcessor.java | 20 +- .../tx/v1/ContractDepositProcessor.java | 19 +- .../tx/v1/ContractStopAgentProcessor.java | 24 +- .../tx/v1/ContractWithdrawProcessor.java | 26 +- .../tx/v1/CreateAgentProcessor.java | 18 +- .../consensus}/tx/v1/DepositProcessor.java | 16 +- .../consensus}/tx/v1/RedPunishProcessor.java | 15 +- .../consensus}/tx/v1/StopAgentProcessor.java | 22 +- .../consensus}/tx/v1/WithdrawProcessor.java | 24 +- .../tx/v1/YellowPunishProcessor.java | 10 +- .../tx/v2/ContractDepositProcessor.java | 20 +- .../tx/v2/ContractStopAgentProcessor.java | 24 +- .../consensus}/tx/v2/DepositProcessor.java | 18 +- .../consensus}/tx/v2/StopAgentProcessor.java | 22 +- .../tx/v3/ContractDepositProcessor.java | 20 +- .../tx/v3/ContractStopAgentProcessor.java | 24 +- .../tx/v3/CreateAgentProcessor.java | 18 +- .../consensus}/tx/v3/DepositProcessor.java | 20 +- .../consensus}/tx/v3/StopAgentProcessor.java | 26 +- .../consensus}/tx/v3/WithdrawProcessor.java | 24 +- .../tx/v4/CreateAgentProcessor.java | 22 +- .../tx/v4/DelayStopAgentProcessor.java | 29 +- .../consensus}/tx/v4/DepositProcessor.java | 22 +- .../consensus}/tx/v4/RedPunishProcessor.java | 24 +- .../consensus}/tx/v4/StopAgentProcessor.java | 26 +- .../consensus}/tx/v4/WithdrawProcessor.java | 26 +- .../io/nuls/consensus}/utils/LoggerUtil.java | 6 +- .../consensus}/utils/RandomSeedCaculator.java | 2 +- .../consensus}/utils/RandomSeedUtils.java | 4 +- .../java/io/nuls/consensus}/utils/TxUtil.java | 18 +- .../utils/compare/AgentComparator.java | 4 +- .../utils/compare/AgentComparatorRpc.java | 4 +- .../utils/compare/BlockHeaderComparator.java | 2 +- .../utils/compare/CoinFromComparator.java | 2 +- .../utils/compare/CoinToComparator.java | 2 +- .../utils/compare/DepositComparator.java | 4 +- .../utils/compare/EvidenceComparator.java | 4 +- .../utils/compare/PunishLogComparator.java | 4 +- .../utils/enumeration/ConsensusStatus.java | 2 +- .../utils/enumeration/PunishReasonEnum.java | 2 +- .../utils/enumeration/PunishType.java | 2 +- .../utils/manager/AgentManager.java | 26 +- .../utils/manager/BlockManager.java | 10 +- .../utils/manager/ChainManager.java | 53 +- .../utils/manager/CoinDataManager.java | 14 +- .../utils/manager/ConsensusManager.java | 35 +- .../utils/manager/DepositManager.java | 16 +- .../utils/manager/FixRedPunishBugHelper.java | 8 +- .../utils/manager/PunishManager.java | 40 +- .../utils/manager/RoundManager.java | 20 +- .../utils/manager/SchedulerManager.java | 8 +- .../utils/thread/ConsensusProcessTask.java | 7 +- .../thread/process/ConsensusProcess.java | 28 +- .../utils/validator/BatchValidator.java | 19 +- .../utils/validator/BlockValidator.java | 34 +- .../utils/validator/TxValidator.java | 34 +- .../nuls/contract/SmartContractBootStrap.java | 167 +--- .../callable/ContractBatchEndCallable.java | 0 .../contract/callable/ContractTxCallable.java | 0 .../callable/ContractTxCallableV14.java | 0 .../callable/ContractTxCallableV8.java | 0 .../nuls/contract/config/ContractContext.java | 0 .../constant/ContractCmdConstant.java | 0 .../contract/constant/ContractConstant.java | 0 .../contract/constant/ContractDBConstant.java | 2 - .../contract/constant/ContractErrorCode.java | 0 .../nuls/contract/enums/BatchInfoStatus.java | 0 .../io/nuls/contract/enums/BlockType.java | 0 .../nuls/contract/enums/CmdRegisterMode.java | 0 .../contract/enums/CmdRegisterReturnType.java | 0 .../nuls/contract/enums/ContractStatus.java | 0 .../enums/LedgerUnConfirmedTxStatus.java | 0 .../nuls/contract/enums/TokenTypeStatus.java | 0 .../helper/ContractConflictChecker.java | 0 .../nuls/contract/helper/ContractHelper.java | 199 +--- .../ContractNewTxFromOtherModuleHandler.java | 7 +- .../contract/helper/ContractNewTxHandler.java | 0 .../helper/ContractTransferHandler.java | 0 .../contract/helper/ContractTxHelper.java | 0 .../nuls/contract/manager/ChainManager.java | 31 +- .../contract/manager/CmdRegisterManager.java | 0 .../manager/ContractTempBalanceManager.java | 0 .../manager/ContractTokenBalanceManager.java | 224 +++++ .../ContractTxCreateUnconfirmedManager.java | 0 .../manager/ContractTxProcessorManager.java | 0 .../manager/ContractTxValidatorManager.java | 0 .../RequestAndResponseInterface.java | 0 .../contract/model/bo/AnalyzerResult.java | 0 .../io/nuls/contract/model/bo/BatchInfo.java | 0 .../nuls/contract/model/bo/BatchInfoV8.java | 0 .../contract/model/bo/CallableResult.java | 0 .../nuls/contract/model/bo/CallerResult.java | 0 .../java/io/nuls/contract/model/bo/Chain.java | 16 +- .../nuls/contract/model/bo/CmdRegister.java | 0 .../contract/model/bo/ContractBalance.java | 0 .../contract/model/bo/ContractContainer.java | 0 .../contract/model/bo/ContractCreate.java | 0 .../model/bo/ContractInternalCreate.java | 0 .../model/bo/ContractMergedTransfer.java | 0 .../bo/ContractMultyAssetMergedTransfer.java | 0 .../contract/model/bo/ContractResult.java | 0 .../model/bo/ContractTempTransaction.java | 0 .../model/bo/ContractTokenAssetsInfo.java | 0 .../contract/model/bo/ContractTokenInfo.java | 0 .../model/bo/ContractWrapperTransaction.java | 0 .../nuls/contract/model/bo/ModelWrapper.java | 0 .../contract/model/bo/MultyAssetOutput.java | 0 .../io/nuls/contract/model/bo/Output.java | 0 .../contract/model/dto/AccountAmountDto.java | 0 .../contract/model/dto/BlockHeaderDto.java | 0 .../model/dto/CallContractDataDto.java | 0 .../contract/model/dto/CmdRegisterDto.java | 0 .../model/dto/ContractAddressDto.java | 0 .../model/dto/ContractConstructorInfoDto.java | 0 .../contract/model/dto/ContractInfoDto.java | 0 .../model/dto/ContractInternalCreateDto.java | 0 .../dto/ContractInvokeRegisterCmdDto.java | 0 .../model/dto/ContractMergedTransferDto.java | 0 .../ContractMultyAssetMergedTransferDto.java | 0 .../contract/model/dto/ContractOutputDto.java | 0 .../model/dto/ContractPackageDto.java | 0 .../contract/model/dto/ContractResultDto.java | 0 .../dto/ContractToken1155TransferDto.java | 0 .../dto/ContractToken721TransferDto.java | 0 .../model/dto/ContractTokenInfoDto.java | 0 .../model/dto/ContractTokenTransferDto.java | 0 .../model/dto/ContractTokenTransferInfo.java | 0 .../ContractTokenTransferTransactionDto.java | 0 .../model/dto/ContractTransactionDto.java | 0 .../model/dto/ContractTransferDataDto.java | 0 .../model/dto/ContractTxRegisterDto.java | 0 .../model/dto/CreateContractDataDto.java | 0 .../model/dto/DeleteContractDataDto.java | 0 .../io/nuls/contract/model/dto/InputDto.java | 0 .../model/dto/ModuleCmdRegisterDto.java | 0 .../model/dto/MultyAssetOutputDto.java | 0 .../io/nuls/contract/model/dto/OutputDto.java | 0 .../model/po/ContractAddressInfoPo.java | 0 .../model/po/ContractCollectionInfoPo.java | 0 .../model/po/ContractOfflineTxHashPo.java | 0 .../model/po/ContractTokenTransferInfoPo.java | 0 .../contract/model/po/TransactionInfoPo.java | 0 .../model/tx/CallContractTransaction.java | 0 .../model/tx/ContractBaseTransaction.java | 0 .../tx/ContractReturnGasTransaction.java | 0 .../model/tx/ContractTransferTransaction.java | 0 .../model/tx/CreateContractTransaction.java | 0 .../tx/CrossTokenContractTransaction.java | 0 .../model/tx/DeleteContractTransaction.java | 0 .../model/txdata/CallContractData.java | 0 .../contract/model/txdata/ContractData.java | 0 .../model/txdata/ContractTransferData.java | 0 .../model/txdata/CreateContractData.java | 0 .../model/txdata/DeleteContractData.java | 0 .../processor/CallContractTxProcessor.java | 94 -- .../processor/CreateContractTxProcessor.java | 36 - .../processor/DeleteContractTxProcessor.java | 0 .../java/io/nuls/contract/rpc/CallHelper.java | 0 .../nuls/contract/rpc/call/AccountCall.java | 0 .../io/nuls/contract/rpc/call/BlockCall.java | 0 .../contract/rpc/call/ChainManagerCall.java | 0 .../nuls/contract/rpc/call/ConsensusCall.java | 0 .../io/nuls/contract/rpc/call/LedgerCall.java | 0 .../contract/rpc/call/TransactionCall.java | 0 .../io/nuls/contract/rpc/cmd/ContractCmd.java | 42 +- .../rpc/cmd/ContractTransactionHandler.java | 1 + .../rpc/resource/ContractResource.java | 161 +--- .../nuls/contract/service/ContractCaller.java | 0 .../contract/service/ContractExecutor.java | 0 .../contract/service/ContractService.java | 0 .../contract/service/ContractTxService.java | 1 - .../nuls/contract/service/ResultAnalyzer.java | 0 .../nuls/contract/service/ResultHanlder.java | 0 .../service/impl/ContractCallerImpl.java | 0 .../service/impl/ContractExecutorImpl.java | 0 .../service/impl/ContractServiceImpl.java | 0 .../service/impl/ContractTxServiceImpl.java | 88 -- .../service/impl/ResultAnalyzerImpl.java | 0 .../service/impl/ResultHandlerImpl.java | 0 .../ContractAddressStorageService.java | 0 .../ContractExecuteResultStorageService.java | 0 ...ntractOfflineTxHashListStorageService.java | 0 .../ContractAddressStorageServiceImpl.java | 0 ...ntractExecuteResultStorageServiceImpl.java | 0 ...ctOfflineTxHashListStorageServiceImpl.java | 0 .../tx/SmartContractVersionChangeInvoker.java | 0 .../tx/common/TransactionCommitAdvice.java | 11 +- .../tx/common/TransactionRollbackAdvice.java | 0 .../contract/tx/v1/CallContractProcessor.java | 0 .../tx/v1/CreateContractProcessor.java | 0 .../tx/v1/DeleteContractProcessor.java | 0 .../tx/v13/CallContractProcessorV13.java | 0 .../tx/v14/CallContractProcessorV14.java | 0 .../tx/v14/CreateContractProcessorV14.java | 0 .../tx/v16/CallContractProcessorV16.java | 4 - .../tx/v16/CreateContractProcessorV16.java | 3 - .../tx/v4/ContractReturnGasProcessor.java | 0 .../tx/v8/CallContractProcessorV8.java | 0 .../tx/v8/CreateContractProcessorV8.java | 0 .../tx/v8/DeleteContractProcessorV8.java | 0 .../nuls/contract/util/CompareTxOrderAsc.java | 0 .../contract/util/CompareTxOrderDesc.java | 0 .../nuls/contract/util/CompareTxTimeAsc.java | 0 .../nuls/contract/util/CompareTxTimeDesc.java | 0 .../io/nuls/contract/util/ContractDBUtil.java | 0 .../contract/util/ContractLedgerUtil.java | 0 .../io/nuls/contract/util/ContractUtil.java | 0 .../main/java/io/nuls/contract/util/Log.java | 0 .../java/io/nuls/contract/util/LogUtil.java | 0 .../java/io/nuls/contract/util/MapUtil.java | 0 .../java/io/nuls/contract/util/VMContext.java | 9 +- .../validator/CallContractTxValidator.java | 0 .../validator/CreateContractTxValidator.java | 4 +- .../validator/DeleteContractTxValidator.java | 0 .../nuls/contract/vm/BigIntegerWrapper.java | 0 .../main/java/io/nuls/contract/vm/Frame.java | 0 .../java/io/nuls/contract/vm/GasCost.java | 0 .../main/java/io/nuls/contract/vm/Heap.java | 0 .../io/nuls/contract/vm/LocalVariables.java | 0 .../java/io/nuls/contract/vm/MethodArea.java | 0 .../java/io/nuls/contract/vm/MethodArgs.java | 0 .../java/io/nuls/contract/vm/ObjectRef.java | 0 .../main/java/io/nuls/contract/vm/OpCode.java | 0 .../io/nuls/contract/vm/OperandStack.java | 0 .../main/java/io/nuls/contract/vm/Result.java | 0 .../src/main/java/io/nuls/contract/vm/VM.java | 0 .../java/io/nuls/contract/vm/VMFactory.java | 0 .../java/io/nuls/contract/vm/VMStack.java | 0 .../io/nuls/contract/vm/code/ClassCode.java | 0 .../contract/vm/code/ClassCodeCacheKey.java | 0 .../contract/vm/code/ClassCodeLoader.java | 10 +- .../io/nuls/contract/vm/code/ClassCodes.java | 0 .../io/nuls/contract/vm/code/Descriptors.java | 0 .../io/nuls/contract/vm/code/FieldCode.java | 0 .../contract/vm/code/LocalVariableCode.java | 0 .../io/nuls/contract/vm/code/MethodCode.java | 0 .../nuls/contract/vm/code/VariableType.java | 0 .../contract/vm/exception/ErrorException.java | 0 .../vm/instructions/comparisons/Dcmp.java | 0 .../vm/instructions/comparisons/Fcmp.java | 0 .../vm/instructions/comparisons/IfAcmp.java | 0 .../vm/instructions/comparisons/IfCmp.java | 0 .../vm/instructions/comparisons/IfIcmp.java | 0 .../vm/instructions/comparisons/Lcmp.java | 0 .../vm/instructions/constants/Aconst.java | 0 .../vm/instructions/constants/Dconst.java | 0 .../vm/instructions/constants/Fconst.java | 0 .../vm/instructions/constants/Iconst.java | 0 .../vm/instructions/constants/Lconst.java | 0 .../vm/instructions/constants/Ldc.java | 0 .../vm/instructions/constants/Nop.java | 0 .../vm/instructions/constants/Xipush.java | 0 .../vm/instructions/control/Goto.java | 0 .../contract/vm/instructions/control/Jsr.java | 0 .../vm/instructions/control/Lookupswitch.java | 0 .../contract/vm/instructions/control/Ret.java | 0 .../vm/instructions/control/Return.java | 0 .../vm/instructions/control/Tableswitch.java | 0 .../vm/instructions/conversions/D2x.java | 0 .../vm/instructions/conversions/F2x.java | 0 .../vm/instructions/conversions/I2x.java | 0 .../vm/instructions/conversions/L2x.java | 0 .../vm/instructions/extended/Ifnonnull.java | 0 .../vm/instructions/extended/Ifnull.java | 0 .../instructions/extended/Multianewarray.java | 0 .../contract/vm/instructions/loads/Aload.java | 0 .../contract/vm/instructions/loads/Dload.java | 0 .../contract/vm/instructions/loads/Fload.java | 0 .../contract/vm/instructions/loads/Iload.java | 0 .../contract/vm/instructions/loads/Lload.java | 0 .../vm/instructions/loads/Xaload.java | 0 .../contract/vm/instructions/math/Add.java | 0 .../contract/vm/instructions/math/And.java | 0 .../contract/vm/instructions/math/Div.java | 0 .../contract/vm/instructions/math/Iinc.java | 0 .../contract/vm/instructions/math/Mul.java | 0 .../contract/vm/instructions/math/Neg.java | 0 .../contract/vm/instructions/math/Or.java | 0 .../contract/vm/instructions/math/Rem.java | 0 .../contract/vm/instructions/math/Shl.java | 0 .../contract/vm/instructions/math/Shr.java | 0 .../contract/vm/instructions/math/Sub.java | 0 .../contract/vm/instructions/math/Ushr.java | 0 .../contract/vm/instructions/math/Xor.java | 0 .../vm/instructions/references/Anewarray.java | 0 .../instructions/references/Arraylength.java | 0 .../vm/instructions/references/Athrow.java | 0 .../vm/instructions/references/Checkcast.java | 0 .../vm/instructions/references/Getfield.java | 0 .../vm/instructions/references/Getstatic.java | 0 .../instructions/references/Instanceof.java | 0 .../references/Invokedynamic.java | 0 .../references/Invokeinterface.java | 0 .../references/Invokespecial.java | 0 .../instructions/references/Invokestatic.java | 0 .../references/Invokevirtual.java | 0 .../instructions/references/Monitorenter.java | 0 .../instructions/references/Monitorexit.java | 0 .../vm/instructions/references/New.java | 0 .../vm/instructions/references/Newarray.java | 0 .../vm/instructions/references/Putfield.java | 0 .../vm/instructions/references/Putstatic.java | 0 .../contract/vm/instructions/stack/Dup.java | 0 .../contract/vm/instructions/stack/Pop.java | 0 .../contract/vm/instructions/stack/Swap.java | 0 .../vm/instructions/stores/Astore.java | 0 .../vm/instructions/stores/Dstore.java | 0 .../vm/instructions/stores/Fstore.java | 0 .../vm/instructions/stores/Istore.java | 0 .../vm/instructions/stores/Lstore.java | 0 .../vm/instructions/stores/Xastore.java | 0 .../contract/vm/natives/NativeMethod.java | 0 .../io/nuls/contract/sdk/NativeAddress.java | 0 .../io/nuls/contract/sdk/NativeBlock.java | 0 .../io/nuls/contract/sdk/NativeMsg.java | 0 .../io/nuls/contract/sdk/NativeUtils.java | 0 .../lang/NativeAbstractStringBuilder.java | 0 .../vm/natives/java/lang/NativeCharacter.java | 0 .../vm/natives/java/lang/NativeClass.java | 0 .../vm/natives/java/lang/NativeDouble.java | 0 .../vm/natives/java/lang/NativeFloat.java | 0 .../vm/natives/java/lang/NativeObject.java | 0 .../vm/natives/java/lang/NativeRuntime.java | 0 .../java/lang/NativeSecurityManager.java | 0 .../natives/java/lang/NativeStrictMath.java | 0 .../vm/natives/java/lang/NativeString.java | 0 .../vm/natives/java/lang/NativeSystem.java | 0 .../vm/natives/java/lang/NativeThrowable.java | 0 .../java/lang/reflect/NativeArray.java | 0 .../vm/natives/java/sun/misc/NativeVM.java | 0 .../contract/vm/program/ProgramAccount.java | 0 .../nuls/contract/vm/program/ProgramCall.java | 0 .../contract/vm/program/ProgramCreate.java | 0 .../vm/program/ProgramCreateData.java | 0 .../vm/program/ProgramEncodePacked.java | 0 .../contract/vm/program/ProgramExecutor.java | 0 .../vm/program/ProgramInternalCall.java | 0 .../vm/program/ProgramInternalCreate.java | 0 .../vm/program/ProgramInvokeRegisterCmd.java | 0 .../contract/vm/program/ProgramMethod.java | 0 .../contract/vm/program/ProgramMethodArg.java | 0 .../vm/program/ProgramMultyAssetValue.java | 0 .../contract/vm/program/ProgramNewTx.java | 0 .../contract/vm/program/ProgramResult.java | 0 .../contract/vm/program/ProgramStatus.java | 0 .../contract/vm/program/ProgramTransfer.java | 0 .../vm/program/impl/ProgramChecker.java | 0 .../vm/program/impl/ProgramConstants.java | 0 .../vm/program/impl/ProgramContext.java | 0 .../vm/program/impl/ProgramDescriptors.java | 0 .../vm/program/impl/ProgramExecutorImpl.java | 0 .../vm/program/impl/ProgramInvoke.java | 0 .../contract/vm/program/impl/ProgramTime.java | 0 .../io/nuls/contract/vm/util/CloneUtils.java | 0 .../io/nuls/contract/vm/util/Constants.java | 0 .../io/nuls/contract/vm/util/JsonUtils.java | 0 .../java/io/nuls/contract/vm/util/Log.java | 0 .../java/io/nuls/contract/vm/util/Utils.java | 0 .../nuls/crosschain/CrossChainBootStrap.java | 121 +++ .../base/constant/CommandConstant.java | 0 .../base/constant/CrossChainConstant.java | 0 .../base/constant/CrossChainErrorCode.java | 0 .../base/constant/ParamConstant.java | 0 .../base/message/BroadCtxHashMessage.java | 0 .../base/message/BroadCtxSignMessage.java | 0 .../base/message/CirculationMessage.java | 0 .../base/message/CrossTxRehandleMessage.java | 0 .../base/message/CtxStateMessage.java | 0 .../base/message/GetCirculationMessage.java | 0 .../base/message/GetCtxStateMessage.java | 0 .../base/message/GetOtherCtxMessage.java | 0 .../base/message/NewOtherCtxMessage.java | 0 .../base/message/base/BaseMessage.java | 0 .../message/handler/BroadCtxHashHandler.java | 0 .../message/handler/BroadCtxSignHandler.java | 0 .../base/message/handler/CtxStateHandler.java | 0 .../handler/GetCirculationHandler.java | 0 .../message/handler/GetCtxStateHandler.java | 0 .../message/handler/GetOtherCtxHandler.java | 0 .../message/handler/NewOtherCtxHandler.java | 0 .../base/model/ResetChainInfoTransaction.java | 0 .../crosschain/base/model/bo/AssetInfo.java | 0 .../crosschain/base/model/bo/ChainInfo.java | 0 .../crosschain/base/model/bo/Circulation.java | 0 .../model/bo/txdata/CrossTransferData.java | 0 .../bo/txdata/RegisteredChainChangeData.java | 0 .../bo/txdata/RegisteredChainMessage.java | 0 .../model/bo/txdata/ResetChainInfoData.java | 0 .../model/bo/txdata/VerifierChangeData.java | 0 .../model/bo/txdata/VerifierInitData.java | 0 .../base/model/dto/input/CoinDTO.java | 0 .../model/dto/input/CrossTxTransferDTO.java | 0 .../base/rpc/cmd/CrossChainCmd.java | 0 .../base/rpc/cmd/CrossChainProtocolCmd.java | 0 .../base/service/CrossChainService.java | 0 .../base/service/ProtocolService.java | 0 .../service/RegisteredChainChangeService.java | 0 .../base/service/ResetChainService.java | 0 .../service/ResetLocalVerifierService.java | 0 .../base/service/VerifierChangeTxService.java | 0 .../base/service/VerifierInitService.java | 0 .../tx/v1/ContractCrossChainProcessor.java | 0 .../base/tx/v1/CrossChainProcessor.java | 0 .../tx/v1/RegisteredChainChangeProcessor.java | 0 .../base/tx/v1/ResetChainInfoTxProcessor.java | 0 .../tx/v1/ResetLocalVerifierProcessor.java | 0 .../base/tx/v1/VerifierChangeProcessor.java | 0 .../base/tx/v1/VerifierInitProcessor.java | 0 .../base/utils/HashSetDuplicateProcessor.java | 0 .../base/utils/annotation/ResisterTx.java | 0 .../enumeration/ChainInfoChangeType.java | 0 .../base/utils/enumeration/TxMethodType.java | 0 .../base/utils/enumeration/TxProperty.java | 0 .../constant/NulsCrossChainConstant.java | 2 +- .../constant/NulsCrossChainErrorCode.java | 2 +- .../crosschain}/constant/ParamConstant.java | 2 +- .../message/CirculationHandler.java | 4 +- .../message/CrossTxRehandleMsgHandler.java | 18 +- .../crosschain}/model/bo/BroadFailFlag.java | 2 +- .../io/nuls/crosschain}/model/bo/Chain.java | 15 +- .../crosschain}/model/bo/CmdRegisterDto.java | 2 +- .../crosschain}/model/bo/CtxStateEnum.java | 2 +- .../nuls/crosschain}/model/bo/NodeType.java | 2 +- .../model/bo/message/UntreatedMessage.java | 2 +- .../bo/message/WaitBroadSignMessage.java | 2 +- .../model/bo/txdata/CrossTxData.java | 2 +- .../crosschain}/model/po/CtxStatusPO.java | 2 +- .../crosschain}/model/po/LocalVerifierPO.java | 2 +- .../crosschain}/model/po/SendCtxHashPO.java | 2 +- .../model/po/VerifierChangeSendFailPO.java | 2 +- .../crosschain}/rpc/call/AccountCall.java | 25 +- .../nuls/crosschain/rpc/call/BlockCall.java | 38 + .../rpc/call/ChainManagerCall.java | 24 +- .../nuls/crosschain}/rpc/call/CommonCall.java | 4 +- .../crosschain}/rpc/call/ConsensusCall.java | 5 +- .../nuls/crosschain}/rpc/call/LedgerCall.java | 26 +- .../crosschain}/rpc/call/NetWorkCall.java | 30 +- .../rpc/call/SmartContractCall.java | 4 +- .../crosschain}/rpc/call/TransactionCall.java | 6 +- .../nuls/crosschain/rpc/cmd/CcmBlockCmd.java | 39 + .../crosschain}/rpc/cmd/CrossChainTxCmd.java | 25 +- .../nuls/crosschain}/rpc/cmd/MainNetCmd.java | 10 +- .../crosschain}/servive/BlockService.java | 2 +- .../crosschain}/servive/MainNetService.java | 2 +- .../servive/impl/BlockServiceImpl.java | 99 +- .../servive/impl/MainNetServiceImpl.java | 69 +- .../impl/NulsCrossChainServiceImpl.java | 142 +-- .../servive/impl/NulsProtocolServiceImpl.java | 35 +- .../RegisteredChainChangeServiceImpl.java | 20 +- .../servive/impl/ResetChainServiceImpl.java | 14 +- .../impl/ResetLocalVerifierServiceImpl.java | 52 +- .../impl/VerifierChangeTxServiceImpl.java | 42 +- .../servive/impl/VerifierInitServiceImpl.java | 36 +- .../srorage/CommitedOtherCtxService.java | 2 +- .../srorage/ConvertCtxService.java | 2 +- .../srorage/ConvertHashService.java | 2 +- .../srorage/CrossChangeBroadFailService.java | 4 +- .../crosschain}/srorage/CtxStateService.java | 2 +- .../crosschain}/srorage/CtxStatusService.java | 4 +- .../srorage/LocalVerifierService.java | 7 +- .../srorage/RegisteredCrossChainService.java | 2 +- .../srorage/SendHeightService.java | 4 +- .../srorage/SendedHeightService.java | 4 +- .../VerifierChangeBroadFailedService.java | 4 +- .../imp/CommitedOtherCtxServiceImpl.java | 6 +- .../srorage/imp/ConvertCtxServiceImpl.java | 6 +- .../srorage/imp/ConvertHashServiceImpl.java | 6 +- .../imp/CrossChangeBroadFailServiceImpl.java | 8 +- .../srorage/imp/CtxStateServiceImpl.java | 7 +- .../srorage/imp/CtxStatusServiceImpl.java | 8 +- .../srorage/imp/LocalVerifierServiceImpl.java | 8 +- .../imp/RegisteredCrossChainServiceImpl.java | 10 +- .../srorage/imp/SendHeightServiceImpl.java | 8 +- .../srorage/imp/SendedHeightServiceImpl.java | 8 +- .../VerifierChangeBroadFailedServiceImpl.java | 8 +- .../nuls/crosschain}/utils/BroadCtxUtil.java | 18 +- .../io/nuls/crosschain}/utils/CommonUtil.java | 19 +- .../io/nuls/crosschain}/utils/LoggerUtil.java | 5 +- .../nuls/crosschain}/utils/MessageUtil.java | 98 +- .../io/nuls/crosschain}/utils/TxUtil.java | 34 +- .../utils/manager/ChainManager.java | 45 +- .../utils/manager/CoinDataManager.java | 52 +- .../utils/manager/LocalVerifierManager.java | 29 +- .../utils/thread/CrossTxHandler.java | 6 +- .../ResetOtherChainVerifierListHandler.java | 7 +- .../utils/thread/VerifierChangeTxHandler.java | 10 +- .../thread/handler/GetCtxStateHandler.java | 8 +- .../thread/handler/HashMessageHandler.java | 8 +- .../handler/OtherCtxMessageHandler.java | 12 +- .../handler/SignMessageByzantineHandler.java | 8 +- .../utils/validator/CrossTxValidator.java | 49 +- .../java/io/nuls/ledger/LedgerBootstrap.java | 94 ++ .../io/nuls/ledger/constant/CmdConstant.java | 0 .../nuls/ledger/constant/LedgerConstant.java | 0 .../nuls/ledger/constant/LedgerErrorCode.java | 0 .../ledger/manager/LedgerChainManager.java | 6 +- .../io/nuls/ledger/model/AccountBalance.java | 0 .../io/nuls/ledger/model/ChainHeight.java | 0 .../io/nuls/ledger/model/FreezeLockState.java | 0 .../io/nuls/ledger/model/LedgerChain.java | 0 .../nuls/ledger/model/TempAccountNonce.java | 0 .../io/nuls/ledger/model/TempMaxAssetId.java | 0 .../io/nuls/ledger/model/Uncfd2CfdKey.java | 0 .../io/nuls/ledger/model/ValidateResult.java | 0 .../io/nuls/ledger/model/po/AccountState.java | 0 .../model/po/AccountStateUnconfirmed.java | 0 .../model/po/BlockSnapshotAccounts.java | 0 .../ledger/model/po/BlockSnapshotTxs.java | 0 .../io/nuls/ledger/model/po/LedgerAsset.java | 0 .../nuls/ledger/model/po/TxUnconfirmed.java | 0 .../model/po/sub/AccountStateSnapshot.java | 0 .../nuls/ledger/model/po/sub/AmountNonce.java | 0 .../model/po/sub/FreezeHeightState.java | 0 .../model/po/sub/FreezeLockTimeState.java | 0 .../ledger/model/tx/AssetRegTransaction.java | 0 .../ledger/model/tx/txdata/TxLedgerAsset.java | 0 .../nuls/ledger/rpc/call/CallRpcService.java | 0 .../rpc/call/impl/CallRpcServiceImpl.java | 4 +- .../nuls/ledger/rpc/cmd/AccountStateCmd.java | 1 + .../io/nuls/ledger/rpc/cmd/AssetsRegCmd.java | 5 +- .../ledger/rpc/cmd/AssetsRegContractCmd.java | 5 +- .../nuls/ledger/rpc/cmd/AssetsRegTxCmd.java | 5 +- .../io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java | 0 .../io/nuls/ledger/rpc/cmd/ChainAssetCmd.java | 1 + .../ledger/rpc/cmd/LgmTransactionCmd.java} | 3 +- .../io/nuls/ledger/rpc/cmd/ValidatorCmd.java | 1 + .../ledger/service/AccountStateService.java | 0 .../ledger/service/AssetRegMngService.java | 0 .../nuls/ledger/service/BlockDataService.java | 0 .../ledger/service/ChainAssetsService.java | 0 .../ledger/service/FreezeStateService.java | 0 .../ledger/service/TransactionService.java | 0 .../service/UnconfirmedStateService.java | 0 .../service/impl/AccountStateServiceImpl.java | 0 .../service/impl/AssetRegMngServiceImpl.java | 4 +- .../service/impl/BlockDataServiceImpl.java | 0 .../service/impl/ChainAssetsServiceImpl.java | 0 .../service/impl/FreezeStateServiceImpl.java | 0 .../service/impl/TransactionServiceImpl.java | 0 .../impl/UnconfirmedStateServiceImpl.java | 0 .../CommontTransactionProcessor.java | 0 .../processor/LockedTransactionProcessor.java | 0 .../service/processor/TxCommonProcessor.java | 0 .../service/processor/TxLockedProcessor.java | 0 .../v15/AssetRegTransferProcessor.java | 0 .../service/v5/AssetRegTransferProcessor.java | 0 .../storage/AccountIndexRepository.java | 0 .../ledger/storage/AssetRegMngRepository.java | 0 .../CrossChainAssetRegMngRepository.java | 0 .../io/nuls/ledger/storage/DataBaseArea.java | 0 .../ledger/storage/LgBlockSyncRepository.java | 0 .../io/nuls/ledger/storage/Repository.java | 0 .../ledger/storage/UnconfirmedRepository.java | 0 .../impl/AccountIndexRepositoryImpl.java | 9 + .../impl/AssetRegMngRepositoryImpl.java | 11 + .../CrossChainAssetRegMngRepositoryImpl.java | 9 + .../impl/LgBlockSyncRepositoryImpl.java | 10 + .../ledger/storage/impl/RepositoryImpl.java | 10 + .../impl/UnconfirmedRepositoryImpl.java | 0 .../io/nuls/ledger/utils/CoinDataUtil.java | 0 .../java/io/nuls/ledger/utils/LedgerUtil.java | 0 .../java/io/nuls/ledger/utils/LockerUtil.java | 0 .../java/io/nuls/ledger/utils/LoggerUtil.java | 0 .../io/nuls/ledger/utils/ResponseUtil.java | 0 .../ledger/validator/CoinDataValidator.java | 0 .../io/nuls/network/NetworkBootstrap.java | 63 +- .../io/nuls/network/constant/CmdConstant.java | 0 .../network/constant/ManagerStatusEnum.java | 0 .../network/constant/NetworkConstant.java | 0 .../network/constant/NetworkErrorCode.java | 0 .../constant/NodeConnectStatusEnum.java | 0 .../nuls/network/constant/NodeStatusEnum.java | 0 .../java/io/nuls/network/locker/Lockers.java | 0 .../io/nuls/network/manager/BaseManager.java | 0 .../network/manager/ConnectionManager.java | 4 +- .../nuls/network/manager/MessageFactory.java | 4 +- .../nuls/network/manager/MessageManager.java | 0 .../network/manager/NodeGroupManager.java | 8 +- .../nuls/network/manager/StorageManager.java | 0 .../io/nuls/network/manager/TaskManager.java | 0 .../io/nuls/network/manager/TimeManager.java | 4 +- .../handler/MessageHandlerFactory.java | 0 .../handler/base/BaseChannelHandler.java | 0 .../handler/base/BaseMeesageHandlerInf.java | 0 .../handler/base/BaseMessageHandler.java | 0 .../handler/message/AddrMessageHandler.java | 3 +- .../message/GetAddrMessageHandler.java | 3 +- .../message/GetTimeMessageHandler.java | 0 .../message/OtherModuleMessageHandler.java | 0 .../message/PeerInfoMessageHandler.java | 0 .../handler/message/PingMessageHandler.java | 0 .../handler/message/PongMessageHandler.java | 0 .../handler/message/TimeMessageHandler.java | 0 .../handler/message/VerackMessageHandler.java | 0 .../message/VersionMessageHandler.java | 6 +- .../network/model/NetworkEventResult.java | 0 .../main/java/io/nuls/network/model/Node.java | 0 .../java/io/nuls/network/model/NodeGroup.java | 6 +- .../nuls/network/model/dto/BestBlockInfo.java | 0 .../java/io/nuls/network/model/dto/Dto.java | 0 .../io/nuls/network/model/dto/IpAddress.java | 0 .../network/model/dto/IpAddressShare.java | 0 .../io/nuls/network/model/dto/NetTimeUrl.java | 0 .../network/model/dto/PeerCacheMessage.java | 0 .../model/dto/ProtocolRoleHandler.java | 0 .../network/model/dto/RpcCacheMessage.java | 0 .../network/model/message/AddrMessage.java | 0 .../network/model/message/ByeMessage.java | 0 .../network/model/message/GetAddrMessage.java | 0 .../network/model/message/GetTimeMessage.java | 0 .../model/message/PeerInfoMessage.java | 0 .../network/model/message/PingMessage.java | 0 .../network/model/message/PongMessage.java | 0 .../network/model/message/TimeMessage.java | 0 .../network/model/message/VerackMessage.java | 0 .../network/model/message/VersionMessage.java | 0 .../model/message/base/BaseMessage.java | 0 .../model/message/base/MessageHeader.java | 0 .../model/message/body/AddrMessageBody.java | 0 .../message/body/GetAddrMessageBody.java | 0 .../message/body/GetTimeMessageBody.java | 0 .../model/message/body/MessageBody.java | 0 .../message/body/PeerInfoMessageBody.java | 0 .../message/body/PingPongMessageBody.java | 0 .../model/message/body/TimeMessageBody.java | 0 .../model/message/body/VerackMessageBody.java | 0 .../message/body/VersionMessageBody.java | 0 .../java/io/nuls/network/model/po/BasePo.java | 0 .../nuls/network/model/po/GroupNodesPo.java | 0 .../io/nuls/network/model/po/GroupPo.java | 0 .../java/io/nuls/network/model/po/NodePo.java | 0 .../network/model/po/NodesContainerPo.java | 0 .../java/io/nuls/network/model/vo/Ivo.java | 0 .../io/nuls/network/model/vo/NodeGroupVo.java | 0 .../java/io/nuls/network/model/vo/NodeVo.java | 0 .../io/nuls/network/netty/NettyClient.java | 0 .../io/nuls/network/netty/NettyServer.java | 0 .../network/netty/NulsChannelInitializer.java | 0 .../NulsLengthFieldBasedFrameDecoder.java | 0 .../netty/codec/NulsMessageDecoder.java | 0 .../netty/codec/NulsMessageEncoder.java | 0 .../netty/container/NodesContainer.java | 0 .../netty/handler/ClientChannelHandler.java | 6 +- .../netty/handler/HeartbeatServerHandler.java | 0 .../netty/handler/ServerChannelHandler.java | 0 .../network/netty/listener/EventListener.java | 0 .../network/rpc/call/BlockRpcService.java | 0 .../rpc/call/impl/BlockRpcServiceImpl.java | 0 .../io/nuls/network/rpc/cmd/MessageRpc.java | 1 + .../nuls/network/rpc/cmd/NetworkInfoRpc.java | 1 + .../io/nuls/network/rpc/cmd/NodeGroupRpc.java | 5 +- .../java/io/nuls/network/rpc/cmd/NodeRpc.java | 5 +- .../nuls/network/rpc/cmd/TimeServiceRpc.java | 6 +- .../io/nuls/network/storage/DbService.java | 0 .../java/io/nuls/network/storage/InitDB.java | 0 .../network/storage/impl/DbServiceImpl.java | 0 .../nuls/network/task/GroupStatusMonitor.java | 0 .../io/nuls/network/task/HeartBeatTask.java | 0 .../nuls/network/task/LocalInfosSendTask.java | 0 .../nuls/network/task/NodeDiscoverTask.java | 3 +- .../network/task/NodeMaintenanceTask.java | 7 +- .../nuls/network/task/NwInfosPrintTask.java | 18 +- .../network/task/PeerCacheMsgSendTask.java | 0 .../network/task/RPCCacheMsgSendTask.java | 0 .../nuls/network/task/SaveNodeInfoTask.java | 0 .../nuls/network/task/ShareAddressTask.java | 4 +- .../java/io/nuls/network/task/TimeTask.java | 0 .../java/io/nuls/network/utils/IpUtil.java | 4 +- .../io/nuls/network/utils/LoggerUtil.java | 0 .../io/nuls/network/utils/MessageUtil.java | 0 .../protocol/ProtocolUpdateBootstrap.java | 75 ++ .../protocol/constant/CommandConstant.java | 0 .../io/nuls/protocol/constant/Constant.java | 0 .../protocol/constant/ProtocolErrorCode.java | 0 .../nuls/protocol/manager/ChainManager.java | 6 + .../nuls/protocol/manager/ContextManager.java | 4 +- .../nuls/protocol/model/ProtocolContext.java | 7 +- .../protocol/model/po/ProtocolVersionPo.java | 0 .../protocol/model/po/StatisticsInfo.java | 0 .../nuls/protocol/rpc/ProtocolResource.java | 1 + .../io/nuls/protocol/rpc/call/BlockCall.java | 0 .../rpc/call/VersionChangeNotifier.java | 5 +- .../protocol/service/ProtocolService.java | 0 .../service/impl/ProtocolServiceImpl.java | 10 +- .../ProtocolVersionStorageService.java | 0 .../storage/StatisticsStorageService.java | 0 .../ProtocolVersionStorageServiceImpl.java | 0 .../impl/StatisticsStorageServiceImpl.java | 0 .../io/nuls/protocol/utils/ConfigLoader.java | 16 +- .../io/nuls/protocol/utils/LoggerUtil.java | 0 .../java/io/nuls/protocol/utils/PoUtil.java | 0 .../transaction/TransactionBootstrap.java | 120 +-- .../nuls/transaction/cache/PackablePool.java | 0 .../io/nuls/transaction/constant/TxCmd.java | 0 .../nuls/transaction/constant/TxConstant.java | 0 .../nuls/transaction/constant/TxContext.java | 0 .../transaction/constant/TxDBConstant.java | 0 .../transaction/constant/TxErrorCode.java | 0 .../transaction/manager/ChainManager.java | 21 +- .../transaction/manager/SchedulerManager.java | 0 .../nuls/transaction/manager/TxManager.java | 21 +- .../message/BroadcastTxMessage.java | 0 .../transaction/message/ForwardTxMessage.java | 0 .../transaction/message/GetTxMessage.java | 0 .../handler/BroadcastTxMessageHandler.java | 0 .../handler/ForwardTxMessageHandler.java | 0 .../message/handler/GetTxMessageHandler.java | 0 .../io/nuls/transaction/model/bo/Chain.java | 2 +- .../transaction/model/bo/OrphanSortItem.java | 0 .../model/bo/OrphanSortResult.java | 0 .../io/nuls/transaction/model/bo/Orphans.java | 0 .../nuls/transaction/model/bo/TxPackage.java | 0 .../model/bo/TxPackageWrapper.java | 0 .../nuls/transaction/model/bo/TxRegister.java | 0 .../transaction/model/bo/TxVerifyWrapper.java | 0 .../model/bo/VerifyLedgerResult.java | 0 .../transaction/model/bo/VerifyResult.java | 0 .../model/dto/AccountBlockDTO.java | 0 .../nuls/transaction/model/dto/CoinDTO.java | 0 .../model/dto/ModuleTxRegisterDTO.java | 0 .../model/po/AccountBlockExtendPO.java | 0 .../transaction/model/po/AccountBlockPO.java | 0 .../model/po/TransactionConfirmedPO.java | 0 .../model/po/TransactionNetPO.java | 0 .../model/po/TransactionUnconfirmedPO.java | 0 .../transaction/rpc/call/AccountCall.java | 0 .../transaction/rpc/call/ConsensusCall.java | 0 .../transaction/rpc/call/ContractCall.java | 0 .../nuls/transaction/rpc/call/LedgerCall.java | 0 .../transaction/rpc/call/NetworkCall.java | 29 - .../transaction/rpc/call/TransactionCall.java | 0 .../nuls/transaction/rpc/cmd/ClientCmd.java | 1 + .../transaction/rpc/cmd/TransactionCmd.java | 1 + .../rpc/upgrade/TxVersionChangeInvoker.java | 7 + .../service/ConfirmedTxService.java | 0 .../nuls/transaction/service/TxService.java | 0 .../service/impl/ConfirmedTxServiceImpl.java | 17 +- .../service/impl/TxServiceImpl.java | 73 +- .../storage/ConfirmedTxStorageService.java | 0 .../storage/UnconfirmedTxStorageService.java | 0 .../impl/ConfirmedTxStorageServiceImpl.java | 0 .../impl/UnconfirmedTxStorageServiceImpl.java | 0 .../task/ClearUnconfirmedTxProcessTask.java | 4 +- .../transaction/task/NetTxProcessTask.java | 0 .../transaction/task/OrphanTxProcessTask.java | 0 .../io/nuls/transaction/utils/DBUtil.java | 0 .../utils/HashSetDuplicateProcessor.java | 0 .../io/nuls/transaction/utils/LoggerUtil.java | 0 .../io/nuls/transaction/utils/OrphanSort.java | 0 .../transaction/utils/TxDuplicateRemoval.java | 0 .../io/nuls/transaction/utils/TxUtil.java | 4 +- .../ethereum/config/BlockchainNetConfig.java | 0 .../org/ethereum/config/CommonConfig.java | 0 .../java/org/ethereum/config/Constants.java | 0 .../org/ethereum/config/DefaultConfig.java | 0 .../org/ethereum/config/SystemProperties.java | 0 .../java/org/ethereum/core/AccountState.java | 0 .../main/java/org/ethereum/core/Block.java | 0 .../java/org/ethereum/core/BlockHeader.java | 0 .../java/org/ethereum/core/Repository.java | 0 .../java/org/ethereum/crypto/HashUtil.java | 0 .../ethereum/crypto/cryptohash/Digest.java | 0 .../crypto/cryptohash/DigestEngine.java | 0 .../ethereum/crypto/cryptohash/Keccak256.java | 0 .../ethereum/crypto/cryptohash/Keccak512.java | 0 .../crypto/cryptohash/KeccakCore.java | 0 .../crypto/jce/ECAlgorithmParameters.java | 0 .../ethereum/crypto/jce/ECKeyAgreement.java | 0 .../org/ethereum/crypto/jce/ECKeyFactory.java | 0 .../crypto/jce/ECKeyPairGenerator.java | 0 .../crypto/jce/ECSignatureFactory.java | 0 .../crypto/jce/SpongyCastleProvider.java | 0 .../datasource/AbstractCachedSource.java | 0 .../datasource/AbstractChainedSource.java | 0 .../ethereum/datasource/AsyncFlushable.java | 0 .../ethereum/datasource/AsyncWriteCache.java | 0 .../org/ethereum/datasource/BatchSource.java | 0 .../datasource/BatchSourceWriter.java | 0 .../org/ethereum/datasource/BloomFilter.java | 0 .../ethereum/datasource/BloomedSource.java | 0 .../org/ethereum/datasource/CachedSource.java | 0 .../datasource/CountingBytesSource.java | 0 .../datasource/CountingQuotientFilter.java | 0 .../ethereum/datasource/DataSourceArray.java | 0 .../org/ethereum/datasource/DbSettings.java | 0 .../org/ethereum/datasource/DbSource.java | 0 .../ethereum/datasource/HashedKeySource.java | 0 .../ethereum/datasource/JournalSource.java | 0 .../ethereum/datasource/MemSizeEstimator.java | 0 .../org/ethereum/datasource/MultiCache.java | 0 .../ethereum/datasource/NoDeleteSource.java | 0 .../datasource/NodeKeyCompositor.java | 0 .../ethereum/datasource/ObjectDataSource.java | 0 .../datasource/PrefixLookupSource.java | 0 .../ethereum/datasource/QuotientFilter.java | 0 .../org/ethereum/datasource/ReadCache.java | 0 .../ethereum/datasource/ReadWriteCache.java | 0 .../org/ethereum/datasource/Serializer.java | 0 .../org/ethereum/datasource/Serializers.java | 0 .../java/org/ethereum/datasource/Source.java | 0 .../ethereum/datasource/SourceChainBox.java | 0 .../org/ethereum/datasource/SourceCodec.java | 0 .../org/ethereum/datasource/WriteCache.java | 0 .../ethereum/datasource/XorDataSource.java | 0 .../ethereum/datasource/inmem/HashMapDB.java | 0 .../datasource/inmem/HashMapDBSimple.java | 0 .../datasource/rocksdb/RocksDbDataSource.java | 4 +- .../org/ethereum/db/AbstractBlockstore.java | 0 .../main/java/org/ethereum/db/BlockStore.java | 0 .../java/org/ethereum/db/BlockStoreDummy.java | 0 .../org/ethereum/db/ByteArrayWrapper.java | 0 .../java/org/ethereum/db/ContractDetails.java | 0 .../java/org/ethereum/db/DbFlushManager.java | 0 .../java/org/ethereum/db/HeaderStore.java | 0 .../org/ethereum/db/IndexedBlockStore.java | 0 .../java/org/ethereum/db/PruneManager.java | 0 .../java/org/ethereum/db/RepositoryImpl.java | 0 .../java/org/ethereum/db/RepositoryRoot.java | 0 .../org/ethereum/db/RepositoryWrapper.java | 0 .../java/org/ethereum/db/StateSource.java | 0 .../org/ethereum/db/index/ArrayListIndex.java | 0 .../java/org/ethereum/db/index/Index.java | 0 .../java/org/ethereum/db/prune/Chain.java | 0 .../java/org/ethereum/db/prune/ChainItem.java | 0 .../java/org/ethereum/db/prune/Pruner.java | 0 .../java/org/ethereum/db/prune/Segment.java | 0 .../java/org/ethereum/facade/Repository.java | 0 .../ethereum/trie/CollectFullSetOfNodes.java | 0 .../java/org/ethereum/trie/CountAllNodes.java | 0 .../src/main/java/org/ethereum/trie/Node.java | 0 .../java/org/ethereum/trie/SecureTrie.java | 0 .../java/org/ethereum/trie/TraceAllNodes.java | 0 .../src/main/java/org/ethereum/trie/Trie.java | 0 .../main/java/org/ethereum/trie/TrieImpl.java | 0 .../main/java/org/ethereum/trie/TrieKey.java | 0 .../main/java/org/ethereum/util/ALock.java | 0 .../main/java/org/ethereum/util/BIUtil.java | 0 .../java/org/ethereum/util/BuildInfo.java | 0 .../java/org/ethereum/util/ByteArrayMap.java | 0 .../java/org/ethereum/util/ByteArraySet.java | 0 .../main/java/org/ethereum/util/ByteUtil.java | 0 .../org/ethereum/util/CollectionUtils.java | 0 .../org/ethereum/util/CompactEncoder.java | 0 .../org/ethereum/util/CopyOnWriteMap.java | 0 .../java/org/ethereum/util/DecodeResult.java | 0 .../org/ethereum/util/ExecutorPipeline.java | 0 .../ethereum/util/FastByteComparisons.java | 0 .../main/java/org/ethereum/util/FileUtil.java | 0 .../java/org/ethereum/util/MinMaxMap.java | 0 .../src/main/java/org/ethereum/util/RLP.java | 0 .../java/org/ethereum/util/RLPElement.java | 0 .../main/java/org/ethereum/util/RLPItem.java | 0 .../main/java/org/ethereum/util/RLPList.java | 0 .../java/org/ethereum/util/SetAdapter.java | 0 .../java/org/ethereum/util/TimeUtils.java | 0 .../main/java/org/ethereum/util/Utils.java | 0 .../main/java/org/ethereum/util/Value.java | 0 .../ethereum/util/blockchain/EtherUtil.java | 0 .../main/java/org/ethereum/vm/DataWord.java | 0 .../src/main/resources/account/FileEmpty.txt} | 0 .../main/resources/block}/genesis-block.json | 0 .../src/main/resources/chain/FileEmpty.txt | 0 .../main/resources/consensus/FileEmpty.txt | 0 .../src/main/resources/contract}/nrc1155.json | 0 .../src/main/resources/contract}/nrc20.json | 0 .../src/main/resources/contract}/nrc721.json | 0 .../resources/contract}/used_classes_base | Bin .../main/resources/contract}/used_classes_sdk | Bin .../resources/contract}/used_classes_sdk_v14 | Bin .../resources/contract}/used_classes_sdk_v15 | Bin .../resources/contract}/used_classes_sdk_v8 | Bin .../crosschain}/db_config.properties | 0 .../main/resources/languages/en.properties | 307 +++++++ .../src/main/resources/ledger/FileEmpty.txt | 0 .../nuls-cores/src/main/resources/module.json | 109 +++ .../src/main/resources/network/FileEmpty.txt | 0 .../src/main/resources/protocol-config.json | 802 ++++++++++++++++ .../main/resources/protocol}/versions.json | 0 .../main/resources/transaction/FileEmpty.txt | 0 .../io/nuls/account/ServiceInitializer.java | 0 .../test/java/io/nuls/account/WsKernel.java | 0 .../nuls/account/rpc/cmd/AccountCmdTest.java | 0 .../io/nuls/account/rpc/cmd/AliasCmdTest.java | 8 +- .../rpc/cmd/MultiSigAccountCmdTest.java | 8 +- .../io/nuls/account/rpc/cmd/TestAddress.java | 0 .../account/rpc/cmd/TransactionCmdTest.java | 8 +- .../rpc/common/CommonRpcOperation.java | 0 .../service/AccountKeyStoreServiceTest.java | 8 +- .../account/service/AccountServiceTest.java | 20 +- .../account/service/AliasServiceTest.java | 0 .../storage/AccountStorageServiceTest.java | 0 .../storage/AliasStorageServiceTest.java | 8 +- .../java/io/nuls/account/tx/CreateTx.java | 2 +- .../java/io/nuls/account/tx/Transfer.java | 4 +- .../test/java/io/nuls/account/tx/TxTest.java | 0 .../io/nuls/account/util/AddressToolTest.java | 0 .../nuls/account/util/AddressV1ToV2Test.java | 0 .../nuls/account/util/PreconditionsTest.java | 0 .../io/nuls/block/BlockGeneratorTest.java | 0 .../test/java/io/nuls/block/CommonTest.java | 0 .../nuls/block/config/GenesisBlockTest.java | 0 .../block/manager/BlockChainManagerTest.java | 0 .../nuls/block/message/BlockMessageTest.java | 0 .../block/message/MessageHandlerTest.java | 0 .../io/nuls/block/message/MessageTest.java | 0 .../handler/SmallBlockHandlerTest.java | 0 .../java/io/nuls/block/model/ChainTest.java | 0 .../io/nuls/block/rpc/BlockResourceTest.java | 0 .../impl/ChainStorageServiceImplTest.java | 0 .../storage/BlockStorageServiceImplTest.java | 0 .../block/thread/BlockDownloaderTest.java | 0 .../block/thread/BlockSynchronizerTest.java | 0 .../thread/monitor/ForkChainsMonitorTest.java | 0 .../java/io/nuls/chain/test/AssetCmdTest.java | 0 .../java/io/nuls/chain/test/ChainCmdTest.java | 0 .../nuls/chain/test/RegCrossChainTxTest.java | 0 .../java/io/nuls/chain/test/StorageTest.java | 0 .../io/nuls/consensus}/CallOtherModule.java | 2 +- .../io/nuls/consensus}/CmdPriorityTest.java | 2 +- .../java/io/nuls/consensus}/TestUtil.java | 8 +- .../io/nuls/consensus}/rpc/AgentTest.java | 12 +- .../io/nuls/consensus}/rpc/ConsensusTest.java | 2 +- .../io/nuls/consensus}/rpc/DepositTest.java | 10 +- .../java/io/nuls/consensus}/rpc/WsKernel.java | 2 +- .../consensus}/storage/AgentDBOperator.java | 4 +- .../consensus}/storage/AgentStorageTest.java | 9 +- .../storage/DepositStorageTest.java | 13 +- .../consensus}/storage/PunishStorageTest.java | 13 +- .../io/nuls/consensus}/utils/MerkleTest.java | 2 +- .../test/java/io/nuls/contract/base/Base.java | 0 .../contract/crypto/ecies/AES256CBCTest.java | 0 .../contract/crypto/ecies/ECIESFinalTest.java | 0 .../nuls/contract/crypto/ecies/HMacTest.java | 0 .../contract/crypto/ecies/Sha512Test.java | 0 .../crypto/ecies/ShareSecretTest.java | 0 .../deserialization/TxDeserialization.java | 0 .../contract/mock/basetest/ContractTest.java | 8 - .../nuls/contract/mock/basetest/MockBase.java | 8 +- .../nuls/contract/mock/basetest/VoteTest.java | 2 +- .../contract/mock/booltest/BooleanTest.java | 0 .../ContractMergeContractTransferTest.java | 0 .../mock/consensus/ConsensusLocalTest.java | 2 +- .../mock/contractvm/ContractVmTest.java | 0 .../mock/contractvm/ContractVmV8Test.java | 0 .../nuls/contract/mock/depth/DepthTest.java | 0 .../mock/helper/ContractHelperMock.java | 0 ...ntractNewTxFromOtherModuleHandlerMock.java | 0 .../InvokeExternalCmdLocalTest.java | 2 +- .../nuls/contract/mock/nrc721/NRC721Test.java | 0 .../mock/pocm/ContractPOCMLocalTest.java | 2 +- .../LoadLargeContractTest.java | 8 +- .../StorageStructureContract.java | 0 .../TwoDimensionalTest.java | 0 .../randomseed/RandomSeedCallTest.java | 0 .../ContractOfflineTxHashPoTest.java | 0 .../contract/serialize/TxSerialization.java | 0 .../io/nuls/contract/testmodel/CoinDto.java | 0 .../nuls/contract/testmodel/CoinFromDto.java | 0 .../io/nuls/contract/testmodel/CoinToDto.java | 0 .../contract/testmodel/TransactionDto.java | 0 .../io/nuls/contract/tx/base/BaseQuery.java | 8 +- .../tx/consensus/ConsensusSendTxTest.java | 0 .../ContractCreateSendTxTest.java | 0 .../ContractCallContractQueryTest.java | 0 .../ContractCallContractSendTxTest.java | 0 .../tx/contractvm/ContractVmSendTxTest.java | 0 .../tx/contractvm/ContractVmV8SendTxTest.java | 0 .../ContractMakeAndBroadcastBase.java | 0 .../ContractMakeAndBroadcastTxTest.java | 0 .../tx/multiSign/MultiSignTxTest.java | 0 .../tx/multyasset/ContractMultyAssetTest.java | 0 .../tx/multytx/ContractMultyTxTest.java | 0 .../tx/nrc20/ContractNRC20TokenQueryTest.java | 0 .../nrc20/ContractNRC20TokenSendTxTest.java | 7 +- .../ContractNRC20CrossTokenSendTxTest.java | 0 .../nrc721/ContractNRC721TokenSendTxTest.java | 0 .../ContractMultyAssetOfflineTest.java | 0 .../tx/pocm/ContractPOCMSendTxTest.java | 46 +- .../tx/randomseed/RandomSeedSendTxTest.java | 0 .../StorageStructureSendTxTest.java | 0 .../tx/temp/ContractTempSendTxTest.java | 0 .../java/io/nuls/contract/utf8/Utf8Test.java | 0 .../io/nuls/contract/util/BeanUtilTest.java | 0 .../contract/util/ContractCodeHexString.java | 0 .../contract/util/ContractDBUtilTest.java | 0 .../io/nuls/contract/util/LedgerTestUtil.java | 0 .../io/nuls/contract/util/VMContextMock.java | 0 .../test/java/io/nuls/crosschain/DbTest.java | 107 +++ .../java/io/nuls/crosschain}/StorageTest.java | 2 +- .../nuls/crosschain}/TestVerifierChange.java | 2 +- .../io/nuls/crosschain}/TxSendTester.java | 2 +- .../nuls/crosschain}/datacheck/SignCheck.java | 2 +- .../datacheck/TransactionCheck.java | 2 +- .../io/nuls/crosschain}/resend/ReadCtx.java | 7 +- .../io/nuls/crosschain}/rpc/AccountTest.java | 2 +- .../crosschain}/rpc/NulsCrossChainTest.java | 2 +- .../nuls/crosschain}/rpc/util/CallUtil.java | 2 +- .../storage/NewCtxServiceTest.java | 10 +- .../storage/SendHeightServiceTest.java | 10 +- .../nuls/ledger/test/cmd/CmdAssetRegTest.java | 0 .../nuls/ledger/test/cmd/CmdChainAsset.java | 0 .../nuls/ledger/test/cmd/CmdGenesisAsset.java | 0 .../nuls/ledger/test/cmd/CmdRollBackTest.java | 0 .../java/io/nuls/ledger/test/cmd/CmdTest.java | 0 .../io/nuls/ledger/test/cmd/CmdTxTest.java | 0 .../ledger/test/cmd/CmdUnconfirmedTxTest.java | 0 .../nuls/ledger/test/cmd/CmdValidateTest.java | 0 .../ledger/test/cmd/CmdWrongDataTest.java | 0 .../java/io/nuls/ledger/test/cmd/HexTest.java | 0 .../io/nuls/ledger/test/cmd/KernelTest.java | 0 .../io/nuls/ledger/test/cmd/TranList.java | 0 .../nuls/ledger/test/constant/TestConfig.java | 0 .../test/validater/TotalAmountTest.java | 0 .../test/java/io/nuls/network/RpcTest.java | 0 .../src/test/java/io/nuls/network/Test1.java | 0 .../java/io/nuls/network/TestConstant.java | 0 .../manager/threads/MessageSendTaskTest.java | 0 .../network/manager/threads/ThreadTest.java | 0 .../network/manager/threads/ThreadTest2.java | 0 .../io/nuls/network/model/NetTimeTest.java | 0 .../nuls/network/other/AtomicIntegerTest.java | 0 .../io/nuls/network/rpc/CrossRpcTest.java | 0 .../io/nuls/network/rpc/MessageRpcTest.java | 0 .../io/nuls/network/rpc/NodeGroupRpcTest.java | 0 .../java/io/nuls/network/rpc/NodeRpcTest.java | 0 .../network/rpc/ProtocolRegisterTest.java | 0 .../protocol/model/ProtocolVersionTest.java | 0 .../protocol/model/po/StatisticsInfoTest.java | 0 .../rpc/callback/BlockHeaderInvokeTest.java | 0 .../transaction/BatchCreateAgentTest.java | 0 .../io/nuls/transaction/CreateTxThread.java | 9 +- .../io/nuls/transaction/TestCommonUtil.java | 0 .../io/nuls/transaction/TestConstant.java | 0 .../java/io/nuls/transaction/TestJyc.java | 9 +- .../test/java/io/nuls/transaction/TestTx.java | 9 +- .../java/io/nuls/transaction/TxMultiSig.java | 9 +- .../java/io/nuls/transaction/TxValid.java | 9 +- .../ConfirmedTxStorageServiceTest.java | 0 .../UnconfirmedTxStorageServiceTest.java | 0 .../rocksdb/RocksDBPerformanceTest.java | 0 .../nuls/transaction/token/AccountData.java | 0 .../transaction/token/AccountDataBetaOne.java | 0 .../nuls/transaction/token/TestJSONObj.java | 0 .../java/io/nuls/transaction/tx/CreateTx.java | 9 +- .../nuls/transaction/tx/EntitySortTest.java | 0 .../java/io/nuls/transaction/tx/Transfer.java | 0 .../io/nuls/transaction/tx/TxCompareTest.java | 9 +- .../io/nuls/transaction/tx/TxCompareTool.java | 0 .../io/nuls/transaction/tx/TxSignTest.java | 0 .../transaction/tx/compare/CompareObj.java | 0 .../tx/compare/TestComparator.java | 0 .../tx/compare/TestComparator2.java | 0 .../nuls/transaction/tx/compare/TestSort.java | 0 .../utils/HashSetDuplicateProcessorTest.java | 0 .../src/test/resources/account}/module.json | 0 .../resources/account}/protocol-config.json | 0 .../src/test/resources/block/FileEmpty.txt | 0 .../src/test/resources/chain/FileEmpty.txt | 0 .../test/resources/consensus/FileEmpty.txt | 0 .../contract}/NRC721Metadata-test.jar | Bin .../contract}/NRC721Receiver-test.jar | Bin .../contract}/contract-consensus-test.jar | Bin .../contract-invoke-external-cmd-test.jar | Bin .../contract}/contract-vm-testA-testA.jar | Bin .../contract}/contract-vm-testB-testB.jar | Bin .../contract}/contract_call_contract | Bin .../resources/contract}/cross-locked-nrc20 | Bin .../cross-token-system-contract-test1.jar | Bin .../contract}/depth-contract-test1.jar | Bin .../resources/contract}/maven-plugin-test.jar | Bin .../resources/contract}/multi-asset-contract | Bin .../src/test/resources/contract}/nrc20 | Bin .../resources/contract}/nrc20-locked-token | Bin .../contract}/nuls-cross-chain-nrc20-test.jar | Bin .../test/resources/contract}/pocmContract-v3 | Bin .../resources/contract}/randomseed-test1.jar | Bin .../test/resources/contract}/simple_chinese | Bin .../test/resources/contract}/token_contract | Bin .../test/resources/contract}/vote_contract | Bin .../test/resources/crosschain/FileEmpty.txt | 0 .../src/test/resources/ledger/FileEmpty.txt | 0 .../src/test/resources/network/FileEmpty.txt | 0 .../src/test/resources/protocol/FileEmpty.txt | 0 .../test/resources/transaction}/alpha2.json | 0 .../test/resources/transaction}/beta1.json | 0 .../test/resources/transaction}/beta2.json | 0 module/nuls-cross-chain/base-lib/pom.xml | 33 - .../base/BaseCrossChainBootStrap.java | 55 -- .../resources/languages/zh-CHS.properties | 3 - .../src/test/java/io/nuls/AppTest.java | 20 - .../nuls-cross-chain/cross-chain/module.ncf | 14 - module/nuls-cross-chain/cross-chain/pom.xml | 30 - .../crosschain/nuls/CrossChainBootStrap.java | 231 ----- .../nuls/constant/NulsCrossChainConfig.java | 134 --- .../nuls/model/bo/config/ConfigBean.java | 240 ----- .../crosschain/nuls/rpc/call/BlockCall.java | 81 -- .../rpc/callback/NewBlockHeightInvoke.java | 31 - .../crosschain/nuls/rpc/cmd/BlockCmd.java | 56 -- .../nuls/srorage/ConfigService.java | 50 - .../nuls/srorage/imp/ConfigServiceImpl.java | 75 -- .../main/resources/languages/en.properties | 31 - .../src/main/resources/module.json | 7 - .../src/main/resources/protocol-config.json | 122 --- module/nuls-cross-chain/pom.xml | 28 - module/nuls-cross-chain/readme.md | 31 - module/nuls-ledger/.gitignore | 5 - module/nuls-ledger/module.ncf | 12 - module/nuls-ledger/pom.xml | 36 - .../src/main/assembly/bin/start.bat | 77 -- .../src/main/assembly/bin/start.sh | 67 -- .../src/main/assembly/bin/stop.bat | 1 - .../nuls-ledger/src/main/assembly/bin/stop.sh | 7 - .../nuls-ledger/src/main/assembly/default.xml | 47 - .../java/io/nuls/ledger/LedgerBootstrap.java | 163 ---- .../io/nuls/ledger/config/LedgerConfig.java | 120 --- .../main/resources/languages/en.properties | 14 - .../src/main/resources/module.json | 6 - .../src/main/resources/protocol-config.json | 43 - module/nuls-network/module.ncf | 12 - module/nuls-network/pom.xml | 43 - .../io/nuls/network/cfg/NetworkConfig.java | 251 ----- .../main/resources/languages/en.properties | 6 - .../src/main/resources/module.json | 15 - module/nuls-protocol-update/module.ncf | 12 - module/nuls-protocol-update/pom.xml | 44 - .../protocol/ProtocolUpdateBootstrap.java | 128 --- .../nuls/protocol/model/ChainParameters.java | 150 --- .../nuls/protocol/model/ProtocolConfig.java | 70 -- .../storage/ParametersStorageService.java | 75 -- .../impl/ParametersStorageServiceImpl.java | 100 -- .../main/resources/languages/en.properties | 2 - .../src/main/resources/module.json | 5 - module/nuls-smart-contract/module.ncf | 15 - .../nuls/contract/config/ContractConfig.java | 171 ---- .../manager/ContractTokenBalanceManager.java | 224 ----- .../contract/model/bo/config/ConfigBean.java | 85 -- .../storage/ConfigStorageService.java | 76 -- .../ContractTokenAddressStorageService.java | 70 -- .../impl/ConfigStorageServiceImpl.java | 97 -- ...ontractTokenAddressStorageServiceImpl.java | 100 -- ...ntractTokenTransferStorageServiceImpl.java | 143 --- .../main/resources/languages/en.properties | 53 -- .../src/main/resources/module.json | 10 - .../src/main/resources/protocol-config.json | 168 ---- module/nuls-transaction/module.ncf | 13 - module/nuls-transaction/pom.xml | 43 - .../nuls/transaction/constant/TxConfig.java | 135 --- .../model/bo/config/ConfigBean.java | 159 ---- .../model/bo/config/ConfigItem.java | 70 -- .../storage/ConfigStorageService.java | 75 -- .../impl/ConfigStorageServiceImpl.java | 101 --- .../main/resources/languages/en.properties | 44 - .../src/main/resources/module.json | 15 - .../src/main/resources/protocol-config.json | 26 - .../storage/ConfigStorageServiceTest.java | 61 -- module/pom.xml | 21 +- version | 2 +- 1632 files changed, 6703 insertions(+), 12307 deletions(-) rename module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenTransferStorageService.java => common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/InvokeBean.java (59%) create mode 100644 common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/NulsCoresCmd.java create mode 100644 common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/util/LocalModuleCall.java delete mode 100644 module/nuls-account/module.ncf delete mode 100644 module/nuls-account/pom.xml delete mode 100644 module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java delete mode 100644 module/nuls-account/src/main/java/io/nuls/account/rpc/call/ContractCall.java delete mode 100644 module/nuls-account/src/main/java/io/nuls/account/storage/ConfigService.java delete mode 100644 module/nuls-account/src/main/java/io/nuls/account/storage/impl/ConfigServiceImpl.java delete mode 100644 module/nuls-account/src/main/java/io/nuls/account/util/manager/ConfigManager.java delete mode 100644 module/nuls-account/src/main/resources/languages/en.properties delete mode 100644 module/nuls-account/src/main/resources/module.json delete mode 100644 module/nuls-account/src/main/resources/protocol-config.json delete mode 100644 module/nuls-block/module.ncf delete mode 100644 module/nuls-block/pom.xml delete mode 100644 module/nuls-block/src/main/java/io/nuls/block/model/BlockConfig.java delete mode 100644 module/nuls-block/src/main/java/io/nuls/block/model/ChainParameters.java delete mode 100644 module/nuls-block/src/main/java/io/nuls/block/storage/ParametersStorageService.java delete mode 100644 module/nuls-block/src/main/java/io/nuls/block/storage/impl/ParametersStorageServiceImpl.java delete mode 100644 module/nuls-block/src/main/resources/languages/en.properties delete mode 100644 module/nuls-block/src/main/resources/module.json delete mode 100644 module/nuls-block/src/main/resources/protocol-config.json delete mode 100644 module/nuls-block/src/test/java/io/nuls/block/model/ChainParametersTest.java delete mode 100644 module/nuls-chain-manager/.gitignore delete mode 100644 module/nuls-chain-manager/module.ncf delete mode 100644 module/nuls-chain-manager/pom.xml delete mode 100644 module/nuls-chain-manager/readme.md delete mode 100644 module/nuls-chain-manager/src/main/java/io/nuls/chain/config/NulsChainConfig.java delete mode 100644 module/nuls-chain-manager/src/main/resources/languages/en.properties delete mode 100644 module/nuls-chain-manager/src/main/resources/module.json delete mode 100644 module/nuls-chain-manager/src/main/resources/protocol-config.json delete mode 100644 module/nuls-consensus/economic-model/base-economic/pom.xml delete mode 100644 module/nuls-consensus/economic-model/base-economic/src/test/java/io/nuls/provider/AppTest.java delete mode 100644 module/nuls-consensus/economic-model/nuls-economic/pom.xml delete mode 100644 module/nuls-consensus/economic-model/nuls-economic/src/test/java/io/nuls/provider/AppTest.java delete mode 100644 module/nuls-consensus/economic-model/pom.xml delete mode 100644 module/nuls-consensus/nuls-consensus-poc/module.ncf delete mode 100644 module/nuls-consensus/nuls-consensus-poc/pom.xml delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConfig.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigBean.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigItem.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/ConfigService.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/ConfigServiceImpl.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/ProtocolUpgradeInvoker.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConfigManager.java delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/resources/languages/en.properties delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/resources/module.json delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/main/resources/protocol-config.json delete mode 100644 module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/ConfigStorageTest.java delete mode 100644 module/nuls-consensus/pom.xml delete mode 100644 module/nuls-consensus/readme.md rename module/{nuls-account/documents => nuls-cores/documents/account}/Module documentation is all here.txt (100%) rename module/{nuls-account/documents => nuls-cores/documents/account}/account.md (100%) rename module/{nuls-account/documents => nuls-cores/documents/account}/account_design.md (100%) rename module/{nuls-account/documents => nuls-cores/documents/account}/img/account-context.png (100%) rename module/{nuls-account/documents => nuls-cores/documents/account}/img/account-functions.png (100%) rename module/{nuls-account/documents => nuls-cores/documents/account}/img/account-module.png (100%) rename module/{nuls-account => nuls-cores/documents/account}/readme.md (100%) rename module/{nuls-block/documents => nuls-cores/documents/block}/Module documentation is all here.txt (100%) rename module/{nuls-block/documents => nuls-cores/documents/block}/block.md (100%) rename module/{nuls-block => nuls-cores/documents/block}/readme.md (100%) rename module/{nuls-chain-manager/documents => nuls-cores/documents/chain}/Module documentation is all here.txt (100%) rename module/{nuls-chain-manager/documents => nuls-cores/documents/chain}/chain-manager.md (100%) rename module/{nuls-consensus/documents => nuls-cores/documents/consensus}/Module documentation is all here.txt (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/consensus.md (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/image/consensus-module/coinbase.png (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/image/consensus-module/consensus-constants.jpg (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/image/consensus-module/consensus-flow-5.png (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/image/consensus-module/consensus-func.png (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/image/consensus-module/consensus-staticsReward.jpg (100%) rename module/{nuls-consensus/nuls-consensus-poc/documents => nuls-cores/documents/consensus}/image/consensus-module/statics_en.png (100%) rename "module/nuls-consensus/nuls-consensus-poc/documents/n.\345\205\261\350\257\206\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" => "module/nuls-cores/documents/consensus/n.\345\205\261\350\257\206\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" (100%) rename module/{nuls-consensus/nuls-consensus-poc => nuls-cores/documents/consensus}/readme.md (100%) rename module/{nuls-ledger/documents => nuls-cores/documents/contract}/Module documentation is all here.txt (100%) rename module/{nuls-smart-contract => nuls-cores/documents/contract}/readme.md (100%) rename module/{nuls-smart-contract/documents => nuls-cores/documents/contract}/smart-contract.md (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain.md (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/Main-Parallel-Ctx.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/MainNet-VerifierChange.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/Parallel-Main-Ctx.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/Parallel-Parallel-Ctx.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/Parallel-VerifierChange.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/Verifire.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/VerifireInit.jpg (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/VerifireInit.png (100%) rename module/{nuls-cross-chain/cross-chain/documents => nuls-cores/documents/crosschain}/cross-chain/cross_chain_functions.png (100%) rename "module/nuls-cross-chain/cross-chain/documents/k.\350\267\250\351\223\276\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" => "module/nuls-cores/documents/crosschain/k.\350\267\250\351\223\276\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" (100%) rename module/{nuls-cross-chain/cross-chain => nuls-cores/documents/crosschain}/readme.md (100%) rename module/{nuls-network/documents => nuls-cores/documents/ledger}/Module documentation is all here.txt (100%) rename module/{nuls-ledger => nuls-cores/documents/ledger}/README.md (100%) rename module/{nuls-ledger/documents => nuls-cores/documents/ledger}/ledger.md (100%) rename module/{nuls-protocol-update/documents => nuls-cores/documents/network}/Module documentation is all here.txt (100%) rename module/{nuls-network/documents => nuls-cores/documents/network}/network.md (100%) rename module/{nuls-network => nuls-cores/documents/network}/readme.md (100%) rename module/{nuls-smart-contract/documents => nuls-cores/documents/protocol}/Module documentation is all here.txt (100%) rename module/{nuls-protocol-update => nuls-cores/documents/protocol}/readme.md (100%) rename module/{nuls-transaction/documents => nuls-cores/documents/transaction}/Module documentation is all here.txt (100%) rename module/{nuls-transaction/documents => nuls-cores/documents/transaction}/img/architecture.png (100%) rename module/{nuls-transaction/documents => nuls-cores/documents/transaction}/img/functional-architecture.png (100%) rename module/{nuls-transaction/documents => nuls-cores/documents/transaction}/img/new-tx.png (100%) rename module/{nuls-transaction => nuls-cores/documents/transaction}/readme.md (100%) rename module/{nuls-transaction/documents => nuls-cores/documents/transaction}/transaction.md (100%) rename module/{nuls-transaction/documents => nuls-cores/documents/transaction}/transaction_design.md (100%) create mode 100644 module/nuls-cores/module.ncf rename module/{nuls-smart-contract => nuls-cores}/pom.xml (65%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/NulsCoresBootstrap.java rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/AccountBootstrap.java (56%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/config/NulsConfig.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/constant/AccountConstant.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/constant/AccountErrorCode.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/constant/AccountStorageConstant.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/constant/RpcConstant.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/constant/RpcParameterNameConstant.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/helper/AccountBlockHelper.java (98%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java (98%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/NonceBalance.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/Account.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/AccountKeyStore.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/AccountStatus.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/Chain.java (96%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/VerifyTxResult.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/tx/AliasTransaction.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/bo/tx/txdata/Alias.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/AccountDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/AccountKeyStoreDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/AccountOfflineDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/BaseCoinDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/CoinDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/MultiSignCoinFromDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/MultiSignCoinToDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/MultiSignTransactionResultDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/MultiSignTransferDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/SimpleAccountDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/dto/TransferDTO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/po/AccountBlockPO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/po/AccountPO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/po/AliasPO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/po/MultiSigAccountPO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/call/EventCall.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/call/LedgerCall.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/call/TransactionCall.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java (99%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java (99%) rename module/{nuls-account/src/main/java/io/nuls/account/rpc/cmd/TransactionCmd.java => nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AcmTransactionCmd.java} (99%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java (99%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java (99%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java (99%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/AccountCacheService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/AccountKeyStoreService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/AccountService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/AliasService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/ChainService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/MultiSignAccountService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/TransactionService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/impl/AccountKeyStoreServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java (98%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/impl/ChainServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/impl/MultiSigAccountServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/AccountStorageService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/AliasStorageService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/MultiSigAccountStorageService.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/impl/AccountStorageServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java (95%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/storage/impl/MultiSigAccountStorageServiceImpl.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/tx/v1/AliasProcessor.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/tx/v1/TransferProcessor.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/util/AccountTool.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/util/LoggerUtil.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/util/Preconditions.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/util/TxUtil.java (100%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/util/manager/ChainManager.java (73%) rename module/{nuls-account => nuls-cores}/src/main/java/io/nuls/account/util/validator/TxValidator.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/BlockBootstrap.java (62%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/BlockErrorCode.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/BlockForwardEnum.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/ChainTypeEnum.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/CommandConstant.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/Constant.java (95%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/LocalBlockStateEnum.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/NodeEnum.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/constant/StatusEnum.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/manager/BlockChainManager.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/manager/ChainManager.java (97%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/manager/ContextManager.java (95%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/BlockMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/CompleteMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/HashListMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/HashMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/HeightMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/HeightRangeMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/SmallBlockMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/TxGroupMessage.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/BlockHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/CompleteHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/ForwardSmallBlockHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/GetBlockByHeightHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/GetBlockHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/GetBlocksHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/GetSmallBlockHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/GetTxGroupHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java (98%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/message/handler/TxGroupHandler.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/BlockDownloaderParams.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/CachedSmallBlock.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/Chain.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/ChainContext.java (97%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/CheckResult.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/GenesisBlock.java (98%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/Node.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/RollbackInfoPo.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/model/TxGroupTask.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/BlockResource.java (99%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/call/ConsensusCall.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/call/ContractCall.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java (89%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/call/NetworkCall.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/call/ProtocolCall.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/rpc/call/TransactionCall.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/service/BlockService.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java (99%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/storage/BlockStorageService.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/storage/ChainStorageService.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/storage/RollbackStorageService.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/storage/impl/BlockStorageServiceImpl.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/storage/impl/ChainStorageServiceImpl.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/storage/impl/RollbackServiceImpl.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/test/BlockGenerator.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/BlockConsumer.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/BlockDownloader.java (98%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/BlockSynchronizer.java (97%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/BaseMonitor.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java (97%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java (96%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java (96%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java (98%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMonitor.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java (98%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/thread/monitor/TxGroupRequestor.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/utils/BlockUtil.java (98%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/utils/ChainGenerator.java (97%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/utils/ConfigLoader.java (72%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/utils/LoggerUtil.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/utils/SingleBlockCacher.java (100%) rename module/{nuls-block => nuls-cores}/src/main/java/io/nuls/block/utils/SmallBlockCacher.java (97%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/ChainManagerBootstrap.java (63%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/info/CmConstants.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/info/CmErrorCode.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/info/CmRuntimeInfo.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/info/RpcConstants.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/AccountBalance.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/AssetDto.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/ChainAssetTotalCirculate.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/ChainDto.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/ChainEventResult.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/CoinDataAssets.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/RegAssetDto.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/RegChainDto.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/dto/Seed.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/po/Asset.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/po/BlockChain.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/po/BlockHeight.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/po/CacheDatas.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/po/ChainAsset.java (83%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/AddAssetToChainTransaction.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/BlockChainTxType.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/DestroyAssetAndChainTransaction.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/RegisterChainAndAssetTransaction.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/RemoveAssetFromChainTransaction.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/txdata/TxAsset.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/txdata/TxChain.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/txdatav5/TxAsset.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/model/tx/txdatav5/TxChain.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/rpc/call/RpcService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/rpc/call/impl/RpcServiceImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java (99%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java (100%) rename module/{nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java => nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/CmmChainCmd.java} (99%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java (99%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/AssetService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/CacheDataService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/ChainService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/CmTransferService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/MessageService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/TxCirculateService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/ValidateService.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java (98%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/CacheDataServiceImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java (98%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java (91%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/CmTransferServiceImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/MessageServiceImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java (98%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java (99%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v1/AddAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetCommitAdvice.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetRollbackAdvice.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v1/DestroyChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v1/DisableAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v1/RegChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v5/AddAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v5/DestroyChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v5/DisableAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v5/RegChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v7/AddAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v7/DestroyChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v7/DisableAssetTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/service/tx/v7/RegChainTransferProcessor.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/AssetStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/BlockHeightStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/CacheDatasStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/ChainAssetStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/ChainCirculateStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/ChainStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/InitDB.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/AssetStorageImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/BaseStorage.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/BlockHeightStorageImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/CacheDatasStorageImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/ChainAssetStorageImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/ChainCirculateStorageImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/storage/impl/ChainStorageImpl.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/task/ChainAssetUpdateTask.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/util/ChainManagerUtil.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/util/LoggerUtil.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/util/ResponseUtil.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/main/java/io/nuls/chain/util/TxUtil.java (100%) rename module/{nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigItem.java => nuls-cores/src/main/java/io/nuls/common/CommonContext.java} (56%) rename module/{nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigItem.java => nuls-cores/src/main/java/io/nuls/common/CommonVersionChangeInvoker.java} (55%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/common/ConfigBean.java create mode 100644 module/nuls-cores/src/main/java/io/nuls/common/ConfigManager.java rename module/{nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigBean.java => nuls-cores/src/main/java/io/nuls/common/INulsCoresBootstrap.java} (56%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/common/NulsCoresConfig.java create mode 100644 module/nuls-cores/src/main/java/io/nuls/consensus/ConsensusBootStrap.java rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/constant/ConsensusConstant.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/constant/ConsensusErrorCode.java (98%) rename module/{nuls-consensus/economic-model/base-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/base/service/EconomicService.java (91%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/constant/NulsEconomicConstant.java (92%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/constant/ParamConstant.java (89%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/model/bo/AgentInfo.java (97%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/model/bo/ConsensusConfigInfo.java (98%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/model/bo/DepositInfo.java (92%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/model/bo/InflationInfo.java (95%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/model/bo/RoundInfo.java (96%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/service/EconomicServiceImpl.java (82%) rename module/{nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls => nuls-cores/src/main/java/io/nuls/consensus}/economic/nuls/util/manager/EconomicManager.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/BlockData.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/Chain.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/ChargeResultData.java (91%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/consensus/Evidence.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/round/MeetingMember.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/round/MeetingRound.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/round/RoundValidResult.java (92%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/Agent.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/CancelDeposit.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/DelayStopAgent.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/Deposit.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/RedPunishData.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/StopAgent.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/bo/tx/txdata/YellowPunishData.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/CmdRegisterDto.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/RandomSeedDTO.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/ContractAgentDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/ContractDepositDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/ContractStopAgentDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/ContractWithdrawDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/CreateAgentDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/CreateDepositDTO.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/CreateMultiAgentDTO.java (89%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/CreateMultiDepositDTO.java (90%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/MultiWithdrawDTO.java (89%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/SearchAgentDTO.java (92%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/SearchAllAgentDTO.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/SearchContractAgentDTO.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/SearchContractDepositDTO.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/SearchDepositDTO.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/SearchPunishDTO.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/StopAgentDTO.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/StopMultiAgentDTO.java (89%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/ValidBlockDTO.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/input/WithdrawDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/output/AccountConsensusInfoDTO.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/output/AgentDTO.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/output/DepositDTO.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/output/PunishLogDTO.java (88%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/output/WholeNetConsensusInfoDTO.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/transaction/CoinDto.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/transaction/CoinFromDto.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/transaction/CoinToDto.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/dto/transaction/TransactionDto.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/po/AgentPo.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/po/DepositPo.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/po/PunishLogPo.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/po/RandomSeedPo.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/model/po/RandomSeedStatusPo.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/call/CallMethodUtils.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/AgentCmd.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/BlockCmd.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/ChainCmd.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/ConsensusTransactionHandler.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ContractCmd.java => nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/CsmContractCmd.java} (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/DepositCmd.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/MultiSignCmd.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/rpc/cmd/RandomCmd.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/AgentService.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/BlockService.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/ChainService.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/ContractService.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/DepositService.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/MultiSignService.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/AgentServiceImpl.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/BlockServiceImpl.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/ChainServiceImpl.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/ContractServiceImpl.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/DepositServiceImpl.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/MultiSignServiceImpl.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/service/impl/RandomSeedService.java (89%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/AgentStorageService.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/DepositStorageService.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/PunishStorageService.java (90%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/RandomSeedsStorageService.java (83%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/impl/AgentStorageServiceImpl.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/impl/DepositStorageServiceImpl.java (92%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/impl/PunishStorageServiceImpl.java (89%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/storage/impl/RandomSeedsStorageServiceImpl.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/CoinBaseProcessor.java (90%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/ContractCreateAgentProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/ContractDepositProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/ContractStopAgentProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/ContractWithdrawProcessor.java (91%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/CreateAgentProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/DepositProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/RedPunishProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/StopAgentProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/WithdrawProcessor.java (92%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v1/YellowPunishProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v2/ContractDepositProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v2/ContractStopAgentProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v2/DepositProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v2/StopAgentProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v3/ContractDepositProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v3/ContractStopAgentProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v3/CreateAgentProcessor.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v3/DepositProcessor.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v3/StopAgentProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v3/WithdrawProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v4/CreateAgentProcessor.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v4/DelayStopAgentProcessor.java (92%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v4/DepositProcessor.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v4/RedPunishProcessor.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v4/StopAgentProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/tx/v4/WithdrawProcessor.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/LoggerUtil.java (84%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/RandomSeedCaculator.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/RandomSeedUtils.java (92%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/TxUtil.java (82%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/AgentComparator.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/AgentComparatorRpc.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/BlockHeaderComparator.java (88%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/CoinFromComparator.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/CoinToComparator.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/DepositComparator.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/EvidenceComparator.java (77%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/compare/PunishLogComparator.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/enumeration/ConsensusStatus.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/enumeration/PunishReasonEnum.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/enumeration/PunishType.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/AgentManager.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/BlockManager.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/ChainManager.java (85%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/CoinDataManager.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/ConsensusManager.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/DepositManager.java (94%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/FixRedPunishBugHelper.java (91%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/PunishManager.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/RoundManager.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/manager/SchedulerManager.java (84%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/thread/ConsensusProcessTask.java (91%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/thread/process/ConsensusProcess.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/validator/BatchValidator.java (96%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/validator/BlockValidator.java (95%) rename module/{nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc => nuls-cores/src/main/java/io/nuls/consensus}/utils/validator/TxValidator.java (96%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/SmartContractBootStrap.java (54%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/callable/ContractBatchEndCallable.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/callable/ContractTxCallable.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/config/ContractContext.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/constant/ContractConstant.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/constant/ContractDBConstant.java (91%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/constant/ContractErrorCode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/BatchInfoStatus.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/BlockType.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/CmdRegisterMode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/CmdRegisterReturnType.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/ContractStatus.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/LedgerUnConfirmedTxStatus.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/helper/ContractConflictChecker.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/helper/ContractHelper.java (81%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java (98%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/helper/ContractTransferHandler.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/helper/ContractTxHelper.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/ChainManager.java (84%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/CmdRegisterManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/ContractTempBalanceManager.java (100%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/ContractTxCreateUnconfirmedManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/ContractTxProcessorManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/manager/interfaces/RequestAndResponseInterface.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/AnalyzerResult.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/BatchInfo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/BatchInfoV8.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/CallableResult.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/CallerResult.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/Chain.java (92%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/CmdRegister.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractBalance.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractContainer.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractCreate.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractMergedTransfer.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractMultyAssetMergedTransfer.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractResult.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractTempTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractTokenAssetsInfo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ContractWrapperTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/ModelWrapper.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/MultyAssetOutput.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/bo/Output.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/BlockHeaderDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/CallContractDataDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/CmdRegisterDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractAddressDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractConstructorInfoDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractInvokeRegisterCmdDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractMergedTransferDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractMultyAssetMergedTransferDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractOutputDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractPackageDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferTransactionDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTransactionDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTransferDataDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ContractTxRegisterDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/CreateContractDataDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/DeleteContractDataDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/InputDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/ModuleCmdRegisterDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/MultyAssetOutputDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/dto/OutputDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/po/ContractAddressInfoPo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/po/ContractCollectionInfoPo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/po/ContractOfflineTxHashPo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/po/ContractTokenTransferInfoPo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/po/TransactionInfoPo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/CallContractTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/ContractBaseTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/ContractReturnGasTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/ContractTransferTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/CreateContractTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/CrossTokenContractTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/tx/DeleteContractTransaction.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/txdata/CallContractData.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/txdata/ContractData.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/txdata/ContractTransferData.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/txdata/CreateContractData.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/model/txdata/DeleteContractData.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java (65%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java (91%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/processor/DeleteContractTxProcessor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/CallHelper.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/call/AccountCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/call/BlockCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/call/ConsensusCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/call/LedgerCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/call/TransactionCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java (96%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java (91%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/ContractCaller.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/ContractExecutor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/ContractService.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/ContractTxService.java (96%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/ResultAnalyzer.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/ResultHanlder.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java (64%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/impl/ResultAnalyzerImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/service/impl/ResultHandlerImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/storage/ContractAddressStorageService.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/storage/ContractExecuteResultStorageService.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/storage/ContractOfflineTxHashListStorageService.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/storage/impl/ContractAddressStorageServiceImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/storage/impl/ContractExecuteResultStorageServiceImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/storage/impl/ContractOfflineTxHashListStorageServiceImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java (89%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/common/TransactionRollbackAdvice.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v1/CallContractProcessor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v1/CreateContractProcessor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v1/DeleteContractProcessor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java (96%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java (96%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v4/ContractReturnGasProcessor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v8/CallContractProcessorV8.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v8/CreateContractProcessorV8.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/tx/v8/DeleteContractProcessorV8.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/CompareTxOrderAsc.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/CompareTxOrderDesc.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/CompareTxTimeAsc.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/CompareTxTimeDesc.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/ContractDBUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/ContractLedgerUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/ContractUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/Log.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/LogUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/MapUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/util/VMContext.java (97%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java (98%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/validator/DeleteContractTxValidator.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/BigIntegerWrapper.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/Frame.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/GasCost.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/Heap.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/LocalVariables.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/MethodArea.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/MethodArgs.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/ObjectRef.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/OpCode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/OperandStack.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/Result.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/VM.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/VMFactory.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/VMStack.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/ClassCode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/ClassCodeCacheKey.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java (96%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/ClassCodes.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/Descriptors.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/FieldCode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/LocalVariableCode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/MethodCode.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/code/VariableType.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/exception/ErrorException.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/comparisons/Dcmp.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/comparisons/Fcmp.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfAcmp.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfCmp.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfIcmp.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/comparisons/Lcmp.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Aconst.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Dconst.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Fconst.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Iconst.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Lconst.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Ldc.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Nop.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/constants/Xipush.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/control/Goto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/control/Jsr.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/control/Lookupswitch.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/control/Ret.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/control/Return.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/control/Tableswitch.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/conversions/D2x.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/conversions/F2x.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/conversions/I2x.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/conversions/L2x.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnonnull.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnull.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/extended/Multianewarray.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/loads/Aload.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/loads/Dload.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/loads/Fload.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/loads/Iload.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/loads/Lload.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/loads/Xaload.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Add.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/And.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Div.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Iinc.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Mul.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Neg.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Or.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Rem.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Shl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Shr.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Sub.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Ushr.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/math/Xor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Anewarray.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Arraylength.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Athrow.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Checkcast.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Getfield.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Getstatic.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Instanceof.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Invokedynamic.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Invokeinterface.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Invokespecial.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Invokestatic.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Invokevirtual.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Monitorenter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Monitorexit.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/New.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Newarray.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Putfield.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/references/Putstatic.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stack/Dup.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stack/Pop.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stack/Swap.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stores/Astore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stores/Dstore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stores/Fstore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stores/Istore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stores/Lstore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/instructions/stores/Xastore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/NativeMethod.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeAbstractStringBuilder.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeCharacter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeClass.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeDouble.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeFloat.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeObject.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeRuntime.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSecurityManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeStrictMath.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeString.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSystem.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeThrowable.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/lang/reflect/NativeArray.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/natives/java/sun/misc/NativeVM.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramAccount.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramInternalCall.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramInvokeRegisterCmd.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramMethodArg.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramMultyAssetValue.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramNewTx.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramResult.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramStatus.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/ProgramTransfer.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramChecker.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramContext.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramDescriptors.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/program/impl/ProgramTime.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/util/CloneUtils.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/util/Constants.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/util/JsonUtils.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/util/Log.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/io/nuls/contract/vm/util/Utils.java (100%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/crosschain/CrossChainBootStrap.java rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/constant/CommandConstant.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/constant/CrossChainConstant.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/constant/CrossChainErrorCode.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/constant/ParamConstant.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/BroadCtxHashMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/BroadCtxSignMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/CirculationMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/CrossTxRehandleMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/CtxStateMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/GetCirculationMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/GetCtxStateMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/GetOtherCtxMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/NewOtherCtxMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/base/BaseMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxHashHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxSignHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/CtxStateHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/GetCirculationHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/GetCtxStateHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/GetOtherCtxHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/message/handler/NewOtherCtxHandler.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/ResetChainInfoTransaction.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/AssetInfo.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/ChainInfo.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/Circulation.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/txdata/CrossTransferData.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainChangeData.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainMessage.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/txdata/ResetChainInfoData.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierChangeData.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierInitData.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/dto/input/CoinDTO.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/model/dto/input/CrossTxTransferDTO.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainCmd.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainProtocolCmd.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/CrossChainService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/ProtocolService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/RegisteredChainChangeService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/ResetChainService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/ResetLocalVerifierService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/VerifierChangeTxService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/service/VerifierInitService.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/ContractCrossChainProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/CrossChainProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/RegisteredChainChangeProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/ResetChainInfoTxProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/ResetLocalVerifierProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierChangeProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierInitProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/utils/HashSetDuplicateProcessor.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/utils/annotation/ResisterTx.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/utils/enumeration/ChainInfoChangeType.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxMethodType.java (100%) rename module/{nuls-cross-chain/base-lib => nuls-cores}/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxProperty.java (100%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/constant/NulsCrossChainConstant.java (98%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/constant/NulsCrossChainErrorCode.java (98%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/constant/ParamConstant.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/message/CirculationHandler.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/message/CrossTxRehandleMsgHandler.java (89%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/BroadFailFlag.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/Chain.java (94%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/CmdRegisterDto.java (98%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/CtxStateEnum.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/NodeType.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/message/UntreatedMessage.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/message/WaitBroadSignMessage.java (95%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/bo/txdata/CrossTxData.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/po/CtxStatusPO.java (98%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/po/LocalVerifierPO.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/po/SendCtxHashPO.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/model/po/VerifierChangeSendFailPO.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/AccountCall.java (82%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/BlockCall.java rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/ChainManagerCall.java (87%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/CommonCall.java (95%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/ConsensusCall.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/LedgerCall.java (84%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/NetWorkCall.java (80%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/SmartContractCall.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/call/TransactionCall.java (91%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CcmBlockCmd.java rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/cmd/CrossChainTxCmd.java (87%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/rpc/cmd/MainNetCmd.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/BlockService.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/MainNetService.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/BlockServiceImpl.java (70%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/MainNetServiceImpl.java (87%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/NulsCrossChainServiceImpl.java (78%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/NulsProtocolServiceImpl.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/RegisteredChainChangeServiceImpl.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/ResetChainServiceImpl.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/ResetLocalVerifierServiceImpl.java (88%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/VerifierChangeTxServiceImpl.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/servive/impl/VerifierInitServiceImpl.java (90%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/CommitedOtherCtxService.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/ConvertCtxService.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/ConvertHashService.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/CrossChangeBroadFailService.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/CtxStateService.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/CtxStatusService.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/LocalVerifierService.java (85%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/RegisteredCrossChainService.java (94%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/SendHeightService.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/SendedHeightService.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/VerifierChangeBroadFailedService.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/CommitedOtherCtxServiceImpl.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/ConvertCtxServiceImpl.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/ConvertHashServiceImpl.java (93%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/CrossChangeBroadFailServiceImpl.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/CtxStateServiceImpl.java (88%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/CtxStatusServiceImpl.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/LocalVerifierServiceImpl.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/RegisteredCrossChainServiceImpl.java (89%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/SendHeightServiceImpl.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/SendedHeightServiceImpl.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/srorage/imp/VerifierChangeBroadFailedServiceImpl.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/BroadCtxUtil.java (97%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/CommonUtil.java (92%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/LoggerUtil.java (83%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/MessageUtil.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/TxUtil.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/manager/ChainManager.java (89%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/manager/CoinDataManager.java (91%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/manager/LocalVerifierManager.java (89%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/CrossTxHandler.java (86%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/ResetOtherChainVerifierListHandler.java (80%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/VerifierChangeTxHandler.java (96%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/handler/GetCtxStateHandler.java (74%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/handler/HashMessageHandler.java (81%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/handler/OtherCtxMessageHandler.java (89%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/thread/handler/SignMessageByzantineHandler.java (84%) rename module/{nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls => nuls-cores/src/main/java/io/nuls/crosschain}/utils/validator/CrossTxValidator.java (88%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/ledger/LedgerBootstrap.java rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/constant/CmdConstant.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/constant/LedgerConstant.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/constant/LedgerErrorCode.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java (96%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/AccountBalance.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/ChainHeight.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/FreezeLockState.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/LedgerChain.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/TempAccountNonce.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/TempMaxAssetId.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/Uncfd2CfdKey.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/ValidateResult.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/AccountState.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/AccountStateUnconfirmed.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/BlockSnapshotAccounts.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/BlockSnapshotTxs.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/LedgerAsset.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/TxUnconfirmed.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/sub/AccountStateSnapshot.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/sub/AmountNonce.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/sub/FreezeHeightState.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/po/sub/FreezeLockTimeState.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/tx/AssetRegTransaction.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/model/tx/txdata/TxLedgerAsset.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/call/CallRpcService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java (99%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java (99%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java (98%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java (99%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java (98%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java (99%) rename module/{nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/TransactionCmd.java => nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/LgmTransactionCmd.java} (99%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java (99%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/AccountStateService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/AssetRegMngService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/BlockDataService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/ChainAssetsService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/FreezeStateService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/TransactionService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/UnconfirmedStateService.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/AccountStateServiceImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java (99%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/BlockDataServiceImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/ChainAssetsServiceImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/FreezeStateServiceImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/TransactionServiceImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/impl/UnconfirmedStateServiceImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/processor/CommontTransactionProcessor.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/processor/LockedTransactionProcessor.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/processor/TxCommonProcessor.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/processor/TxLockedProcessor.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/service/v5/AssetRegTransferProcessor.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/AccountIndexRepository.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/AssetRegMngRepository.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/CrossChainAssetRegMngRepository.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/DataBaseArea.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/LgBlockSyncRepository.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/Repository.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/UnconfirmedRepository.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java (91%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java (94%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java (94%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java (95%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java (95%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/storage/impl/UnconfirmedRepositoryImpl.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/utils/CoinDataUtil.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/utils/LedgerUtil.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/utils/LockerUtil.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/utils/LoggerUtil.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/utils/ResponseUtil.java (100%) rename module/{nuls-ledger => nuls-cores}/src/main/java/io/nuls/ledger/validator/CoinDataValidator.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/NetworkBootstrap.java (80%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/constant/CmdConstant.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/constant/ManagerStatusEnum.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/constant/NetworkConstant.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/constant/NetworkErrorCode.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/constant/NodeConnectStatusEnum.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/constant/NodeStatusEnum.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/locker/Lockers.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/BaseManager.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/ConnectionManager.java (98%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/MessageFactory.java (98%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/MessageManager.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/NodeGroupManager.java (96%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/StorageManager.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/TaskManager.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/TimeManager.java (98%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/MessageHandlerFactory.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/base/BaseChannelHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/base/BaseMeesageHandlerInf.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/base/BaseMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java (96%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java (93%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/GetTimeMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/OtherModuleMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/PeerInfoMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/PingMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/PongMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/TimeMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/VerackMessageHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java (96%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/NetworkEventResult.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/Node.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/NodeGroup.java (98%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/BestBlockInfo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/Dto.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/IpAddress.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/IpAddressShare.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/NetTimeUrl.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/PeerCacheMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/ProtocolRoleHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/dto/RpcCacheMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/AddrMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/ByeMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/GetAddrMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/GetTimeMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/PeerInfoMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/PingMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/PongMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/TimeMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/VerackMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/VersionMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/base/BaseMessage.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/base/MessageHeader.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/AddrMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/GetAddrMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/GetTimeMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/MessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/PeerInfoMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/PingPongMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/TimeMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/VerackMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/message/body/VersionMessageBody.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/po/BasePo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/po/GroupNodesPo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/po/GroupPo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/po/NodePo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/po/NodesContainerPo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/vo/Ivo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/vo/NodeGroupVo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/model/vo/NodeVo.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/NettyClient.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/NettyServer.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/NulsChannelInitializer.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/codec/NulsLengthFieldBasedFrameDecoder.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/codec/NulsMessageDecoder.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/codec/NulsMessageEncoder.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/container/NodesContainer.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java (94%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/handler/HeartbeatServerHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/handler/ServerChannelHandler.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/netty/listener/EventListener.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/call/BlockRpcService.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/call/impl/BlockRpcServiceImpl.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java (99%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java (99%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java (99%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java (99%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java (92%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/storage/DbService.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/storage/InitDB.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/storage/impl/DbServiceImpl.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/GroupStatusMonitor.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/HeartBeatTask.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/LocalInfosSendTask.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/NodeDiscoverTask.java (99%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java (95%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/NwInfosPrintTask.java (92%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/PeerCacheMsgSendTask.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/RPCCacheMsgSendTask.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/SaveNodeInfoTask.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/ShareAddressTask.java (97%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/task/TimeTask.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/utils/IpUtil.java (98%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/utils/LoggerUtil.java (100%) rename module/{nuls-network => nuls-cores}/src/main/java/io/nuls/network/utils/MessageUtil.java (100%) create mode 100644 module/nuls-cores/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/constant/CommandConstant.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/constant/Constant.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/constant/ProtocolErrorCode.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/manager/ChainManager.java (94%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/manager/ContextManager.java (94%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/model/ProtocolContext.java (97%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/model/po/ProtocolVersionPo.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/model/po/StatisticsInfo.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java (99%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/rpc/call/BlockCall.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java (96%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/service/ProtocolService.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java (97%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/storage/ProtocolVersionStorageService.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/storage/StatisticsStorageService.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/storage/impl/ProtocolVersionStorageServiceImpl.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/storage/impl/StatisticsStorageServiceImpl.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/utils/ConfigLoader.java (83%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/utils/LoggerUtil.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/main/java/io/nuls/protocol/utils/PoUtil.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/TransactionBootstrap.java (50%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/cache/PackablePool.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/constant/TxCmd.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/constant/TxConstant.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/constant/TxContext.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/constant/TxDBConstant.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/constant/TxErrorCode.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/manager/ChainManager.java (91%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/manager/SchedulerManager.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/manager/TxManager.java (86%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/message/BroadcastTxMessage.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/message/ForwardTxMessage.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/message/GetTxMessage.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/message/handler/BroadcastTxMessageHandler.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/message/handler/ForwardTxMessageHandler.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/message/handler/GetTxMessageHandler.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/Chain.java (99%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/OrphanSortItem.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/OrphanSortResult.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/Orphans.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/TxPackage.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/TxPackageWrapper.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/TxRegister.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/TxVerifyWrapper.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/VerifyLedgerResult.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/bo/VerifyResult.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/dto/CoinDTO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/dto/ModuleTxRegisterDTO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/po/TransactionConfirmedPO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/po/TransactionNetPO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/model/po/TransactionUnconfirmedPO.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/call/ConsensusCall.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/call/ContractCall.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/call/LedgerCall.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java (86%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/call/TransactionCall.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java (99%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java (99%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java (92%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/service/ConfirmedTxService.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/service/TxService.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java (96%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java (97%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/storage/ConfirmedTxStorageService.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/storage/UnconfirmedTxStorageService.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/storage/impl/ConfirmedTxStorageServiceImpl.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/storage/impl/UnconfirmedTxStorageServiceImpl.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java (97%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/task/NetTxProcessTask.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/task/OrphanTxProcessTask.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/utils/DBUtil.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/utils/HashSetDuplicateProcessor.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/utils/LoggerUtil.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/utils/OrphanSort.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/utils/TxDuplicateRemoval.java (100%) rename module/{nuls-transaction => nuls-cores}/src/main/java/io/nuls/transaction/utils/TxUtil.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/config/BlockchainNetConfig.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/config/CommonConfig.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/config/Constants.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/config/DefaultConfig.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/config/SystemProperties.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/core/AccountState.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/core/Block.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/core/BlockHeader.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/core/Repository.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/HashUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/cryptohash/Digest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/cryptohash/DigestEngine.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/cryptohash/Keccak256.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/cryptohash/Keccak512.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/cryptohash/KeccakCore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/jce/ECAlgorithmParameters.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/jce/ECKeyAgreement.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/jce/ECKeyFactory.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/jce/ECKeyPairGenerator.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/jce/ECSignatureFactory.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/crypto/jce/SpongyCastleProvider.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/AbstractCachedSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/AbstractChainedSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/AsyncFlushable.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/AsyncWriteCache.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/BatchSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/BatchSourceWriter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/BloomFilter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/BloomedSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/CachedSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/CountingBytesSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/CountingQuotientFilter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/DataSourceArray.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/DbSettings.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/DbSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/HashedKeySource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/JournalSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/MemSizeEstimator.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/MultiCache.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/NoDeleteSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/NodeKeyCompositor.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/ObjectDataSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/PrefixLookupSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/QuotientFilter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/ReadCache.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/ReadWriteCache.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/Serializer.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/Serializers.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/Source.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/SourceChainBox.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/SourceCodec.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/WriteCache.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/XorDataSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/inmem/HashMapDB.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/inmem/HashMapDBSimple.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java (98%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/AbstractBlockstore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/BlockStore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/BlockStoreDummy.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/ByteArrayWrapper.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/ContractDetails.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/DbFlushManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/HeaderStore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/IndexedBlockStore.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/PruneManager.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/RepositoryImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/RepositoryRoot.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/RepositoryWrapper.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/StateSource.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/index/ArrayListIndex.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/index/Index.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/prune/Chain.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/prune/ChainItem.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/prune/Pruner.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/db/prune/Segment.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/facade/Repository.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/CollectFullSetOfNodes.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/CountAllNodes.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/Node.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/SecureTrie.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/TraceAllNodes.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/Trie.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/TrieImpl.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/trie/TrieKey.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/ALock.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/BIUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/BuildInfo.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/ByteArrayMap.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/ByteArraySet.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/ByteUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/CollectionUtils.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/CompactEncoder.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/CopyOnWriteMap.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/DecodeResult.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/ExecutorPipeline.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/FastByteComparisons.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/FileUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/MinMaxMap.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/RLP.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/RLPElement.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/RLPItem.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/RLPList.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/SetAdapter.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/TimeUtils.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/Utils.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/Value.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/util/blockchain/EtherUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/main/java/org/ethereum/vm/DataWord.java (100%) rename module/{nuls-cross-chain/base-lib/src/main/resources/languages/en.properties => nuls-cores/src/main/resources/account/FileEmpty.txt} (100%) rename module/{nuls-block/src/main/resources => nuls-cores/src/main/resources/block}/genesis-block.json (100%) create mode 100644 module/nuls-cores/src/main/resources/chain/FileEmpty.txt create mode 100644 module/nuls-cores/src/main/resources/consensus/FileEmpty.txt rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/nrc1155.json (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/nrc20.json (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/nrc721.json (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/used_classes_base (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/used_classes_sdk (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/used_classes_sdk_v14 (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/used_classes_sdk_v15 (100%) rename module/{nuls-smart-contract/src/main/resources => nuls-cores/src/main/resources/contract}/used_classes_sdk_v8 (100%) rename module/{nuls-cross-chain/base-lib/src/main/resources => nuls-cores/src/main/resources/crosschain}/db_config.properties (100%) create mode 100644 module/nuls-cores/src/main/resources/languages/en.properties create mode 100644 module/nuls-cores/src/main/resources/ledger/FileEmpty.txt create mode 100644 module/nuls-cores/src/main/resources/module.json create mode 100644 module/nuls-cores/src/main/resources/network/FileEmpty.txt create mode 100644 module/nuls-cores/src/main/resources/protocol-config.json rename module/{nuls-protocol-update/src/main/resources => nuls-cores/src/main/resources/protocol}/versions.json (100%) create mode 100644 module/nuls-cores/src/main/resources/transaction/FileEmpty.txt rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/ServiceInitializer.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/WsKernel.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/rpc/cmd/AccountCmdTest.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java (97%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java (96%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/rpc/cmd/TestAddress.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java (98%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/rpc/common/CommonRpcOperation.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java (92%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/service/AccountServiceTest.java (94%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/service/AliasServiceTest.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/storage/AccountStorageServiceTest.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java (94%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/tx/CreateTx.java (99%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/tx/Transfer.java (99%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/tx/TxTest.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/util/AddressToolTest.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/util/AddressV1ToV2Test.java (100%) rename module/{nuls-account => nuls-cores}/src/test/java/io/nuls/account/util/PreconditionsTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/BlockGeneratorTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/CommonTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/config/GenesisBlockTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/manager/BlockChainManagerTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/message/BlockMessageTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/message/MessageHandlerTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/message/MessageTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/message/handler/SmallBlockHandlerTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/model/ChainTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/rpc/BlockResourceTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/service/impl/ChainStorageServiceImplTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/storage/BlockStorageServiceImplTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/thread/BlockDownloaderTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/thread/BlockSynchronizerTest.java (100%) rename module/{nuls-block => nuls-cores}/src/test/java/io/nuls/block/thread/monitor/ForkChainsMonitorTest.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/test/java/io/nuls/chain/test/AssetCmdTest.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/test/java/io/nuls/chain/test/ChainCmdTest.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java (100%) rename module/{nuls-chain-manager => nuls-cores}/src/test/java/io/nuls/chain/test/StorageTest.java (100%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/CallOtherModule.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/CmdPriorityTest.java (98%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/TestUtil.java (81%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/rpc/AgentTest.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/rpc/ConsensusTest.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/rpc/DepositTest.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/rpc/WsKernel.java (97%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/storage/AgentDBOperator.java (99%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/storage/AgentStorageTest.java (93%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/storage/DepositStorageTest.java (88%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/storage/PunishStorageTest.java (87%) rename module/{nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/consensus}/utils/MerkleTest.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/base/Base.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/crypto/ecies/AES256CBCTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/crypto/ecies/ECIESFinalTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/crypto/ecies/HMacTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/crypto/ecies/Sha512Test.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/crypto/ecies/ShareSecretTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/deserialization/TxDeserialization.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java (97%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/basetest/MockBase.java (97%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/booltest/BooleanTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/callable/ContractMergeContractTransferTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/contractvm/ContractVmTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/contractvm/ContractVmV8Test.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/depth/DepthTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/helper/ContractHelperMock.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/helper/ContractNewTxFromOtherModuleHandlerMock.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/nrc721/NRC721Test.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java (98%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/storagestructure/StorageStructureContract.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/mock/twodimensionaltest/TwoDimensionalTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/randomseed/RandomSeedCallTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/serialize/ContractOfflineTxHashPoTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/serialize/TxSerialization.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/testmodel/CoinDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/testmodel/CoinFromDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/testmodel/CoinToDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/testmodel/TransactionDto.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/base/BaseQuery.java (99%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/consensus/ConsensusSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractQueryTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/contractvm/ContractVmSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/contractvm/ContractVmV8SendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/multytx/ContractMultyTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java (97%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/nrc20cross/ContractNRC20CrossTokenSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/nrc721/ContractNRC721TokenSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/offline/ContractMultyAssetOfflineTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java (93%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/storagestructure/StorageStructureSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/tx/temp/ContractTempSendTxTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/utf8/Utf8Test.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/util/BeanUtilTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/util/ContractCodeHexString.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/util/LedgerTestUtil.java (100%) rename module/{nuls-smart-contract => nuls-cores}/src/test/java/io/nuls/contract/util/VMContextMock.java (100%) create mode 100644 module/nuls-cores/src/test/java/io/nuls/crosschain/DbTest.java rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/StorageTest.java (97%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/TestVerifierChange.java (99%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/TxSendTester.java (99%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/datacheck/SignCheck.java (97%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/datacheck/TransactionCheck.java (98%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/resend/ReadCtx.java (95%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/rpc/AccountTest.java (99%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/rpc/NulsCrossChainTest.java (99%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/rpc/util/CallUtil.java (97%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/storage/NewCtxServiceTest.java (84%) rename module/{nuls-cross-chain/cross-chain/src/test/java/io/nuls/test => nuls-cores/src/test/java/io/nuls/crosschain}/storage/SendHeightServiceTest.java (89%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdAssetRegTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdChainAsset.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdGenesisAsset.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdRollBackTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdTxTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdUnconfirmedTxTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdValidateTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/CmdWrongDataTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/HexTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/KernelTest.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/cmd/TranList.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/constant/TestConfig.java (100%) rename module/{nuls-ledger => nuls-cores}/src/test/java/io/nuls/ledger/test/validater/TotalAmountTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/RpcTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/Test1.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/TestConstant.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/manager/threads/MessageSendTaskTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/manager/threads/ThreadTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/manager/threads/ThreadTest2.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/model/NetTimeTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/other/AtomicIntegerTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/rpc/CrossRpcTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/rpc/MessageRpcTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/rpc/NodeGroupRpcTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/rpc/NodeRpcTest.java (100%) rename module/{nuls-network => nuls-cores}/src/test/java/io/nuls/network/rpc/ProtocolRegisterTest.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/test/java/io/nuls/protocol/model/ProtocolVersionTest.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/test/java/io/nuls/protocol/model/po/StatisticsInfoTest.java (100%) rename module/{nuls-protocol-update => nuls-cores}/src/test/java/io/nuls/protocol/rpc/callback/BlockHeaderInvokeTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/BatchCreateAgentTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/CreateTxThread.java (94%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/TestCommonUtil.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/TestConstant.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/TestJyc.java (95%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/TestTx.java (99%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/TxMultiSig.java (98%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/TxValid.java (99%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/storage/ConfirmedTxStorageServiceTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/storage/UnconfirmedTxStorageServiceTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/storage/rocksdb/RocksDBPerformanceTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/token/AccountData.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/token/AccountDataBetaOne.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/token/TestJSONObj.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/CreateTx.java (96%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/EntitySortTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/Transfer.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/TxCompareTest.java (97%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/TxCompareTool.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/TxSignTest.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/compare/CompareObj.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/compare/TestComparator.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/compare/TestComparator2.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/tx/compare/TestSort.java (100%) rename module/{nuls-transaction => nuls-cores}/src/test/java/io/nuls/transaction/utils/HashSetDuplicateProcessorTest.java (100%) rename module/{nuls-account/src/test/resources => nuls-cores/src/test/resources/account}/module.json (100%) rename module/{nuls-account/src/test/resources => nuls-cores/src/test/resources/account}/protocol-config.json (100%) create mode 100644 module/nuls-cores/src/test/resources/block/FileEmpty.txt create mode 100644 module/nuls-cores/src/test/resources/chain/FileEmpty.txt create mode 100644 module/nuls-cores/src/test/resources/consensus/FileEmpty.txt rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/NRC721Metadata-test.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/NRC721Receiver-test.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/contract-consensus-test.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/contract-invoke-external-cmd-test.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/contract-vm-testA-testA.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/contract-vm-testB-testB.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/contract_call_contract (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/cross-locked-nrc20 (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/cross-token-system-contract-test1.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/depth-contract-test1.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/maven-plugin-test.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/multi-asset-contract (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/nrc20 (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/nrc20-locked-token (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/nuls-cross-chain-nrc20-test.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/pocmContract-v3 (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/randomseed-test1.jar (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/simple_chinese (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/token_contract (100%) rename module/{nuls-smart-contract/src/test/resources => nuls-cores/src/test/resources/contract}/vote_contract (100%) create mode 100644 module/nuls-cores/src/test/resources/crosschain/FileEmpty.txt create mode 100644 module/nuls-cores/src/test/resources/ledger/FileEmpty.txt create mode 100644 module/nuls-cores/src/test/resources/network/FileEmpty.txt create mode 100644 module/nuls-cores/src/test/resources/protocol/FileEmpty.txt rename module/{nuls-transaction/src/test/resources => nuls-cores/src/test/resources/transaction}/alpha2.json (100%) rename module/{nuls-transaction/src/test/resources => nuls-cores/src/test/resources/transaction}/beta1.json (100%) rename module/{nuls-transaction/src/test/resources => nuls-cores/src/test/resources/transaction}/beta2.json (100%) delete mode 100644 module/nuls-cross-chain/base-lib/pom.xml delete mode 100644 module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/BaseCrossChainBootStrap.java delete mode 100644 module/nuls-cross-chain/base-lib/src/main/resources/languages/zh-CHS.properties delete mode 100644 module/nuls-cross-chain/base-lib/src/test/java/io/nuls/AppTest.java delete mode 100644 module/nuls-cross-chain/cross-chain/module.ncf delete mode 100644 module/nuls-cross-chain/cross-chain/pom.xml delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/CrossChainBootStrap.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConfig.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/config/ConfigBean.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/BlockCall.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/callback/NewBlockHeightInvoke.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/BlockCmd.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConfigService.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConfigServiceImpl.java delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/resources/languages/en.properties delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/resources/module.json delete mode 100644 module/nuls-cross-chain/cross-chain/src/main/resources/protocol-config.json delete mode 100644 module/nuls-cross-chain/pom.xml delete mode 100644 module/nuls-cross-chain/readme.md delete mode 100755 module/nuls-ledger/.gitignore delete mode 100644 module/nuls-ledger/module.ncf delete mode 100644 module/nuls-ledger/pom.xml delete mode 100644 module/nuls-ledger/src/main/assembly/bin/start.bat delete mode 100644 module/nuls-ledger/src/main/assembly/bin/start.sh delete mode 100644 module/nuls-ledger/src/main/assembly/bin/stop.bat delete mode 100644 module/nuls-ledger/src/main/assembly/bin/stop.sh delete mode 100644 module/nuls-ledger/src/main/assembly/default.xml delete mode 100644 module/nuls-ledger/src/main/java/io/nuls/ledger/LedgerBootstrap.java delete mode 100644 module/nuls-ledger/src/main/java/io/nuls/ledger/config/LedgerConfig.java delete mode 100644 module/nuls-ledger/src/main/resources/languages/en.properties delete mode 100644 module/nuls-ledger/src/main/resources/module.json delete mode 100644 module/nuls-ledger/src/main/resources/protocol-config.json delete mode 100644 module/nuls-network/module.ncf delete mode 100644 module/nuls-network/pom.xml delete mode 100644 module/nuls-network/src/main/java/io/nuls/network/cfg/NetworkConfig.java delete mode 100644 module/nuls-network/src/main/resources/languages/en.properties delete mode 100644 module/nuls-network/src/main/resources/module.json delete mode 100644 module/nuls-protocol-update/module.ncf delete mode 100644 module/nuls-protocol-update/pom.xml delete mode 100644 module/nuls-protocol-update/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java delete mode 100644 module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ChainParameters.java delete mode 100644 module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolConfig.java delete mode 100644 module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/ParametersStorageService.java delete mode 100644 module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/ParametersStorageServiceImpl.java delete mode 100644 module/nuls-protocol-update/src/main/resources/languages/en.properties delete mode 100644 module/nuls-protocol-update/src/main/resources/module.json delete mode 100644 module/nuls-smart-contract/module.ncf delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractConfig.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigBean.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ConfigStorageService.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenAddressStorageService.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ConfigStorageServiceImpl.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenAddressStorageServiceImpl.java delete mode 100644 module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenTransferStorageServiceImpl.java delete mode 100644 module/nuls-smart-contract/src/main/resources/languages/en.properties delete mode 100644 module/nuls-smart-contract/src/main/resources/module.json delete mode 100644 module/nuls-smart-contract/src/main/resources/protocol-config.json delete mode 100644 module/nuls-transaction/module.ncf delete mode 100644 module/nuls-transaction/pom.xml delete mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java delete mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigBean.java delete mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigItem.java delete mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/storage/ConfigStorageService.java delete mode 100644 module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/ConfigStorageServiceImpl.java delete mode 100644 module/nuls-transaction/src/main/resources/languages/en.properties delete mode 100644 module/nuls-transaction/src/main/resources/module.json delete mode 100644 module/nuls-transaction/src/main/resources/protocol-config.json delete mode 100644 module/nuls-transaction/src/test/java/io/nuls/transaction/storage/ConfigStorageServiceTest.java diff --git a/README.md b/README.md index 195ab422cf..d804449bb3 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Note: Some documents are in the process of being updated, so please understand i ## Contribution -Contributions to NULS are welcomed! We sincerely invite developers who are experienced in the blockchain field to join the NULS technology community. Details: https://forum.nuls.io/c/tech/34. To be a great community, Nuls needs to welcome developers from all walks of life, with different backgrounds, and with a wide range of experience. +Contributions to NULS are welcomed! We sincerely invite developers who are experienced in the blockchain field to join the NULS technology community. Details: https://nuls.community/d/9-invitation-of-community-developers. To be a great community, Nuls needs to welcome developers from all walks of life, with different backgrounds, and with a wide range of experience. ## License @@ -108,6 +108,7 @@ Modules added in the future may be released under a different license specified - [Facebook](https://www.facebook.com/nulscommunity/) - [YouTube channel](https://www.youtube.com/channel/UC8FkLeF4QW6Undm4B3InN1Q?view_as=subscriber) - Telegram [NULS Community](https://t.me/Nulsio) +- Telegram [NULS 中文社区](https://t.me/Nulscn) #### diff --git a/build/package-base.ncf b/build/package-base.ncf index 89c7aa66ef..d248a8ab8a 100644 --- a/build/package-base.ncf +++ b/build/package-base.ncf @@ -1,10 +1,11 @@ [package] -account=1 -block=1 -consensus=1 -ledger=1 -network=1 -transaction=1 +account=0 +block=0 +consensus=0 +ledger=0 +network=0 +transaction=0 +nuls-cores=1 cmd-client=1 nuls-api=0 public-service=0 diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java index c3b42bbe5c..7050aa4bd4 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java @@ -42,9 +42,9 @@ public static boolean isSupportCrossChain() { } public static void init(RpcModule module) { - supportProtocolUpdate = enableProtocolUpdate(module); - supportSmartContract = enableSmartContract(module); - supportCrossChain = enableCrossChain(module); + supportProtocolUpdate = true; + supportSmartContract = true; + supportCrossChain = true; Log.info("----------------ModuleHelper----------------"); Log.info("module-" + module.toString()); Log.info("supportProtocolUpdate-"+supportProtocolUpdate); diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java index 5f6281fd1a..b52aa5c653 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java @@ -132,13 +132,13 @@ public static void updateProtocol(int chainId, short protocolVersion) { } }); messageDispatcher.setProcessors(messageProcessors); - try { - if (ConnectManager.getConnectByRole(ModuleE.TX.abbr) != null) { - RegisterHelper.registerTx(chainId, protocol); - } - } catch (Exception e) { - Log.warn(e.getMessage()); - } + //try { + // if (ConnectManager.getConnectByRole(ModuleE.TX.abbr) != null) { + // RegisterHelper.registerTx(chainId, protocol); + // } + //} catch (Exception e) { + // Log.warn(e.getMessage()); + //} } } } diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java index cd34f8b889..7b849390e5 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java @@ -29,6 +29,8 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.CmdAnnotation; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.NulsCoresCmd; import io.nuls.core.rpc.model.Parameter; import io.nuls.core.rpc.model.message.Response; @@ -43,6 +45,7 @@ * @date 18-11-14 下午4:23 */ @Component +@NulsCoresCmd(module = ModuleE.NC) public class CommonProtocolCmd extends BaseCmd { @CmdAnnotation(cmd = "protocolVersionChange", version = 1.0, scope = Constants.PRIVATE, description = "") diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java index 529918f2e9..32fbfd52a7 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java @@ -9,6 +9,8 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.CmdAnnotation; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.NulsCoresCmd; import io.nuls.core.rpc.model.Parameter; import io.nuls.core.rpc.model.message.Response; @@ -24,6 +26,7 @@ * @date 2019/5/23 21:05 */ @Component +@NulsCoresCmd(module = ModuleE.NC) public final class MessageDispatcher extends BaseCmd { private List processors; diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java index 732695bbce..2099315bda 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java @@ -7,7 +7,7 @@ import io.nuls.base.protocol.TransactionProcessor; import io.nuls.core.constant.BaseConstant; import io.nuls.core.constant.CommonCodeConstanst; -import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.model.ObjectUtils; @@ -15,8 +15,11 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.CmdAnnotation; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.NulsCoresCmd; import io.nuls.core.rpc.model.Parameter; import io.nuls.core.rpc.model.message.Response; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import java.util.ArrayList; import java.util.HashMap; @@ -32,6 +35,7 @@ * @date 2019/5/24 19:02 */ @Component +@NulsCoresCmd(module = ModuleE.NC) public final class TransactionDispatcher extends BaseCmd { private List processors; @@ -46,17 +50,25 @@ public void setProcessors(List processors) { this.processors = processors; } - @Autowired("EmptyCommonAdvice") - private CommonAdvice commitAdvice; - @Autowired("EmptyCommonAdvice") - private CommonAdvice rollbackAdvice; + private Map commitAdviceMap = new HashMap<>(); + private Map rollbackAdviceMap = new HashMap<>(); - public void register(CommonAdvice commitAdvice, CommonAdvice rollbackAdvice) { + public void register(ModuleE module, CommonAdvice commitAdvice, CommonAdvice rollbackAdvice) { + if (module == ModuleE.SC) { + // 跨链模块的token跨链转入交易，需要把普通跨链交易转换成调用合约交易来写入系统跨链合约 + if (commitAdvice != null) { + commitAdviceMap.put(String.valueOf(TxType.CROSS_CHAIN), commitAdvice); + } + if (rollbackAdvice != null) { + rollbackAdviceMap.put(String.valueOf(TxType.CROSS_CHAIN), rollbackAdvice); + } + } + // 按实际模块注册 if (commitAdvice != null) { - this.commitAdvice = commitAdvice; + commitAdviceMap.put(module.abbr, commitAdvice); } if (rollbackAdvice != null) { - this.rollbackAdvice = rollbackAdvice; + rollbackAdviceMap.put(module.abbr, rollbackAdvice); } } @@ -97,7 +109,11 @@ public Response txValidator(Map params) { } String errorCode = ""; for (TransactionProcessor processor : processors) { - Map validateMap = processor.validate(chainId, map.get(processor.getType()), map, blockHeader); + List transactions = map.get(processor.getType()); + if (transactions.isEmpty()) { + continue; + } + Map validateMap = processor.validate(chainId, transactions, map, blockHeader); if(validateMap == null) { continue; } @@ -139,7 +155,8 @@ public Response txCommit(Map params) { Transaction tx = RPCUtil.getInstanceRpcStr(txStr, Transaction.class); txs.add(tx); } - commitAdvice.begin(chainId, txs, blockHeader); + boolean commitAdviceBegin = false; + CommonAdvice commitAdvice = null; Map> map = new HashMap<>(); for (TransactionProcessor processor : processors) { for (Transaction tx : txs) { @@ -152,7 +169,24 @@ public Response txCommit(Map params) { Map resultMap = new HashMap<>(2); List completedProcessors = new ArrayList<>(); for (TransactionProcessor processor : processors) { - boolean commit = processor.commit(chainId, map.get(processor.getType()), blockHeader); + List transactions = map.get(processor.getType()); + if (transactions.isEmpty()) { + continue; + } + // 按实际模块调用 + if (!commitAdviceBegin) { + commitAdviceBegin = true; + String moduleCode = ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(processor.getType()); + commitAdvice = commitAdviceMap.get(moduleCode); + if (commitAdvice == null) { + commitAdvice = commitAdviceMap.get(String.valueOf(processor.getType())); + } + if (commitAdvice != null) { + commitAdvice.begin(chainId, txs, blockHeader); + } + } + + boolean commit = processor.commit(chainId, transactions, blockHeader); if (!commit) { completedProcessors.forEach(e -> e.rollback(chainId, map.get(e.getType()), blockHeader)); resultMap.put("value", commit); @@ -162,7 +196,9 @@ public Response txCommit(Map params) { } } resultMap.put("value", true); - commitAdvice.end(chainId, txs, blockHeader); + if (commitAdvice != null) { + commitAdvice.end(chainId, txs, blockHeader); + } return success(resultMap); } @@ -189,7 +225,8 @@ public Response txRollback(Map params) { Transaction tx = RPCUtil.getInstanceRpcStr(txStr, Transaction.class); txs.add(tx); } - rollbackAdvice.begin(chainId, txs, blockHeader); + boolean rollbackAdviceBegin = false; + CommonAdvice rollbackAdvice = null; Map> map = new HashMap<>(); for (TransactionProcessor processor : processors) { for (Transaction tx : txs) { @@ -202,7 +239,24 @@ public Response txRollback(Map params) { Map resultMap = new HashMap<>(2); List completedProcessors = new ArrayList<>(); for (TransactionProcessor processor : processors) { - boolean rollback = processor.rollback(chainId, map.get(processor.getType()), blockHeader); + List transactions = map.get(processor.getType()); + if (transactions.isEmpty()) { + continue; + } + // 按实际模块调用 + if (!rollbackAdviceBegin) { + rollbackAdviceBegin = true; + String moduleCode = ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(processor.getType()); + rollbackAdvice = rollbackAdviceMap.get(moduleCode); + if (rollbackAdvice == null) { + rollbackAdvice = rollbackAdviceMap.get(String.valueOf(processor.getType())); + } + if (rollbackAdvice != null) { + rollbackAdvice.begin(chainId, txs, blockHeader); + } + } + + boolean rollback = processor.rollback(chainId, transactions, blockHeader); if (!rollback) { completedProcessors.forEach(e -> e.commit(chainId, map.get(e.getType()), blockHeader)); resultMap.put("value", rollback); @@ -212,7 +266,9 @@ public Response txRollback(Map params) { } } resultMap.put("value", true); - rollbackAdvice.end(chainId, txs, blockHeader); + if (rollbackAdvice != null) { + rollbackAdvice.end(chainId, txs, blockHeader); + } return success(resultMap); } diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java b/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java index 775d2269b3..70cda9642c 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java @@ -81,7 +81,7 @@ public int size() { @Override public String toString() { - return "CoinTo{" + + return "CoinFrom{" + "address=" + AddressTool.getStringAddressByBytes(address) + ", assetsChainId=" + assetsChainId + ", assetsId=" + assetsId + diff --git a/common/nuls-core-rockdb/src/main/java/io/nuls/core/rockdb/manager/RocksDBManager.java b/common/nuls-core-rockdb/src/main/java/io/nuls/core/rockdb/manager/RocksDBManager.java index 6f12a15a76..fa1fd86c54 100644 --- a/common/nuls-core-rockdb/src/main/java/io/nuls/core/rockdb/manager/RocksDBManager.java +++ b/common/nuls-core-rockdb/src/main/java/io/nuls/core/rockdb/manager/RocksDBManager.java @@ -62,6 +62,10 @@ public class RocksDBManager { */ private static String dataPath; + public static void setDataPath(String dataPath) { + RocksDBManager.dataPath = dataPath; + } + /** * 根据传入的数据库路径将已存在的数据库连接打开，并缓存DB连接. * 如果有数据表连接被关闭需要重新打开连接也可以，执行初始化连接 diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenTransferStorageService.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/InvokeBean.java similarity index 59% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenTransferStorageService.java rename to common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/InvokeBean.java index 5b11b4f41f..077fe697b9 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenTransferStorageService.java +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/InvokeBean.java @@ -1,18 +1,18 @@ -/* +/** * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * + *

+ * Copyright (c) 2017-2018 nuls.io + *

* Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,30 +20,42 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * */ -package io.nuls.contract.storage; - +package io.nuls.core.rpc.model; -import io.nuls.contract.model.po.ContractTokenTransferInfoPo; -import io.nuls.core.basic.Result; +import io.nuls.core.rpc.cmd.BaseCmd; -import java.util.List; +import java.lang.reflect.Method; /** - * @desription: * @author: PierreLuo - * @date: 2018/8/28 + * @date: 2023/6/27 */ -public interface ContractTokenTransferStorageService { +public class InvokeBean { + private BaseCmd baseCmd; + private Method method; + + public InvokeBean() { + } - Result saveTokenTransferInfo(int chainId, byte[] key, ContractTokenTransferInfoPo tx); + public InvokeBean(BaseCmd baseCmd, Method method) { + this.baseCmd = baseCmd; + this.method = method; + } - Result deleteTokenTransferInfo(int chainId, byte[] infoKey) throws Exception; + public BaseCmd getBaseCmd() { + return baseCmd; + } - Result getTokenTransferInfo(int chainId, byte[] infoKey); + public void setBaseCmd(BaseCmd baseCmd) { + this.baseCmd = baseCmd; + } - List getTokenTransferInfoListByAddress(int chainId, byte[] address); + public Method getMethod() { + return method; + } - List getTokenTransferInfoListByAddress(int chainId, byte[] address, byte[] txHash); + public void setMethod(Method method) { + this.method = method; + } } diff --git a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/ModuleE.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/ModuleE.java index b255864aa2..df88aeaf5f 100644 --- a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/ModuleE.java +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/ModuleE.java @@ -49,7 +49,8 @@ public enum ModuleE { PU("pu", Constant.PROTOCOL_UPDATE, ModuleE.DOMAIN), CC("cc", Constant.CROSS_CHAIN, ModuleE.DOMAIN), SC("sc", Constant.SMART_CONTRACT, ModuleE.DOMAIN), - AP("ap", Constant.PUBLIC_SERVICE, ModuleE.DOMAIN); + AP("ap", Constant.PUBLIC_SERVICE, ModuleE.DOMAIN), + NC("nc", Constant.NULS_CORES, ModuleE.DOMAIN); public static final String DOMAIN = "Nuls"; @@ -82,6 +83,8 @@ public static class Constant { public static final String PUBLIC_SERVICE = "public-service"; public static final String CMD = "cmd-client"; + + public static final String NULS_CORES = "nuls-cores"; } public final String abbr; diff --git a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/NulsCoresCmd.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/NulsCoresCmd.java new file mode 100644 index 0000000000..3a156ef8cb --- /dev/null +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/model/NulsCoresCmd.java @@ -0,0 +1,15 @@ +package io.nuls.core.rpc.model; + +import java.lang.annotation.*; + +/** + * @author: PierreLuo + * @date: 2023/6/27 + * 标记核心模块cmd所属模块 + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface NulsCoresCmd { + ModuleE module(); +} diff --git a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/modulebootstrap/ModuleStatusCmd.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/modulebootstrap/ModuleStatusCmd.java index 61ff37062c..0b949d84ac 100644 --- a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/modulebootstrap/ModuleStatusCmd.java +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/modulebootstrap/ModuleStatusCmd.java @@ -7,6 +7,8 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.CmdAnnotation; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.NulsCoresCmd; import io.nuls.core.rpc.model.message.Response; import java.util.Map; @@ -17,6 +19,7 @@ * @Description: 功能描述 */ @Component +@NulsCoresCmd(module = ModuleE.NC) public class ModuleStatusCmd extends BaseCmd { @Autowired diff --git a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/RequestMessageProcessor.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/RequestMessageProcessor.java index 6e35014341..5d0f048848 100644 --- a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/RequestMessageProcessor.java +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/RequestMessageProcessor.java @@ -517,7 +517,13 @@ private static Response invoke(String invokeClass, String invokeMethod, Map para return MessageUtil.newFailResponse("", CMD_NOT_FOUND); } long start = System.currentTimeMillis(); - Response response = (Response) method.invoke(cmd, params); + Log.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); + Log.info("-=-=-=-::{},{}",method.toString(),cmd.getClass().getName()); + Log.info("-=-=-=-::{}",JSONUtils.obj2json(params)); + Object invoke = method.invoke(cmd, params); + Log.info("cmd: {}, invoke obj: {}", cmd.getClass().getName(), invoke.getClass().getName()); + Response response = (Response) invoke; +// Response response = (Response) method.invoke(cmd, params); long use = System.currentTimeMillis() - start; if (use > 1000) { Log.warn(invokeMethod + " , use:{}ms", use); diff --git a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/ResponseMessageProcessor.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/ResponseMessageProcessor.java index 93d756d6e2..13127aec61 100644 --- a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/ResponseMessageProcessor.java +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/ResponseMessageProcessor.java @@ -3,6 +3,7 @@ import io.netty.channel.Channel; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.Address; +import io.nuls.core.constant.BaseConstant; import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; @@ -11,13 +12,16 @@ import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.invoke.BaseInvoke; import io.nuls.core.rpc.invoke.KernelInvoke; +import io.nuls.core.rpc.model.InvokeBean; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.*; import io.nuls.core.rpc.netty.channel.manager.ConnectManager; import io.nuls.core.rpc.netty.processor.container.RequestContainer; import io.nuls.core.rpc.netty.processor.container.ResponseContainer; +import io.nuls.core.rpc.util.LocalModuleCall; import io.nuls.core.rpc.util.SerializeUtil; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -32,7 +36,22 @@ public class ResponseMessageProcessor { private static final Long REGISTER_API_TIME_OUT = 180L * 1000L; - + public static final Map INVOKE_BEAN_MAP = new HashMap<>(); + public static final Map ROLE_MAPPING = new HashMap<>(); + public static final Map TX_TYPE_MODULE_MAP = new HashMap<>(); + static { + ROLE_MAPPING.put(ModuleE.AC.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.BL.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.CS.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.CC.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.CM.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.LG.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.NW.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.PU.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.TX.abbr, ModuleE.NC.abbr); + ROLE_MAPPING.put(ModuleE.SC.abbr, ModuleE.NC.abbr); + BaseConstant.NULS_CORES_DOMAINS.addAll(ROLE_MAPPING.keySet()); + } /** * 与已连接的模块握手 * Shake hands with the core module (Manager) @@ -194,6 +213,15 @@ public static Response requestAndResponse(String role, String cmd, Map params) t * @throws Exception 请求超时（timeOut），timeout (timeOut) */ public static Response requestAndResponse(String role, String cmd, Map params, long timeOut) throws Exception { + if (ModuleE.NC.abbr.equalsIgnoreCase(ConnectManager.LOCAL.getAbbreviation())) { + String key = role + "_" + cmd; + InvokeBean invokeBean = INVOKE_BEAN_MAP.get(key); + if (invokeBean != null) { + return LocalModuleCall.requestAndResponse(invokeBean, role, cmd, params, timeOut); + } else { + Log.warn("Empty requestAndResponse key: {}", key); + } + } Request request = MessageUtil.newRequest(cmd, params, Constants.BOOLEAN_FALSE, Constants.ZERO, Constants.ZERO); request.setTimeOut(String.valueOf(timeOut)); ResponseContainer responseContainer = sendRequest(role, request); @@ -276,11 +304,23 @@ public static String requestAndInvoke(String role, Request request, BaseInvoke b * @return 远程方法的返回结果，Response of the remote method * @throws Exception 请求超时（1分钟），timeout (1 minute) */ - public static String requestOnly(String role, Request request)throws Exception{ + public static String requestOnly(String role, Request request) throws Exception { + if (ModuleE.NC.abbr.equalsIgnoreCase(ConnectManager.LOCAL.getAbbreviation())) { + Map requestMethods = request.getRequestMethods(); + Map.Entry next = requestMethods.entrySet().iterator().next(); + String key = role + "_" + next.getKey(); + InvokeBean invokeBean = INVOKE_BEAN_MAP.get(key); + if (invokeBean != null) { + return LocalModuleCall.requestOnly(invokeBean, next.getValue(), role, request); + } else { + Log.warn("Empty requestOnly key: {}", key); + } + } + String mappingRole = ROLE_MAPPING.getOrDefault(role, role); Message message = MessageUtil.basicMessage(MessageType.RequestOnly); message.setMessageData(request); - Channel channel = ConnectManager.getConnectByRole(role); - if(!channel.isWritable()){ + Channel channel = ConnectManager.getConnectByRole(mappingRole); + if (!channel.isWritable()) { Log.info("当前请求堆积过多,等待请求处理"); return "0"; } @@ -298,11 +338,10 @@ public static String requestOnly(String role, Request request)throws Exception{ * @throws Exception JSON格式转换错误、连接失败 / JSON format conversion error, connection failure */ private static ResponseContainer sendRequest(String role, Request request) throws Exception { - + String mappingRole = ROLE_MAPPING.getOrDefault(role, role); Message message = MessageUtil.basicMessage(MessageType.Request); message.setMessageData(request); - - Channel channel = ConnectManager.getConnectByRole(role); + Channel channel = ConnectManager.getConnectByRole(mappingRole); ResponseContainer responseContainer = RequestContainer.putRequest(message.getMessageID()); diff --git a/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/util/LocalModuleCall.java b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/util/LocalModuleCall.java new file mode 100644 index 0000000000..3edf0a4084 --- /dev/null +++ b/common/nuls-core-rpc/src/main/java/io/nuls/core/rpc/util/LocalModuleCall.java @@ -0,0 +1,52 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.core.rpc.util; + +import io.nuls.core.parse.JSONUtils; +import io.nuls.core.rpc.model.InvokeBean; +import io.nuls.core.rpc.model.message.Request; +import io.nuls.core.rpc.model.message.Response; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author: PierreLuo + * @date: 2023/7/5 + */ +public class LocalModuleCall { + + public static Response requestAndResponse(InvokeBean invokeBean, String role, String cmd, Object params, long timeOut) throws Exception { + Response response = (Response) invokeBean.getMethod().invoke(invokeBean.getBaseCmd(), JSONUtils.byteArray2pojo(JSONUtils.obj2ByteArray(params), Map.class)); + Map responseData = new HashMap<>(2); + responseData.put(cmd, response.getResponseData()); + response.setResponseData(responseData); + return JSONUtils.byteArray2pojo(JSONUtils.obj2ByteArray(response), Response.class); + } + + public static String requestOnly(InvokeBean invokeBean, Object params, String role, Request request) throws Exception { + invokeBean.getMethod().invoke(invokeBean.getBaseCmd(), JSONUtils.byteArray2pojo(JSONUtils.obj2ByteArray(params), Map.class)); + return "1"; + } +} diff --git a/common/nuls-core/src/main/java/io/nuls/core/constant/BaseConstant.java b/common/nuls-core/src/main/java/io/nuls/core/constant/BaseConstant.java index 2167a3ea52..1ff076aa31 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/constant/BaseConstant.java +++ b/common/nuls-core/src/main/java/io/nuls/core/constant/BaseConstant.java @@ -1,5 +1,8 @@ package io.nuls.core.constant; +import java.util.ArrayList; +import java.util.List; + /** * @author tag */ @@ -72,4 +75,6 @@ public class BaseConstant { * 模块统一交易回滚RPC接口 */ public static final String TX_ROLLBACK = "txRollback"; + + public static final List NULS_CORES_DOMAINS = new ArrayList<>(); } diff --git a/common/nuls-core/src/main/java/io/nuls/core/core/annotation/Order.java b/common/nuls-core/src/main/java/io/nuls/core/core/annotation/Order.java index 5e61a2b736..f3dd758f76 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/core/annotation/Order.java +++ b/common/nuls-core/src/main/java/io/nuls/core/core/annotation/Order.java @@ -1,11 +1,16 @@ package io.nuls.core.core.annotation; +import java.lang.annotation.*; + /** * @Author: zhoulijun * @Time: 2019-03-04 13:34 * @Description: 标记bean的加载顺序，以及实现了InitializingBean接口类执行afterPropertiesSet的顺序 * 如果不设置此注解，加载权重值为1 */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented public @interface Order { public static final int DEFALUT_ORDER = 1; diff --git a/common/nuls-core/src/main/java/io/nuls/core/core/config/ConfigurationLoader.java b/common/nuls-core/src/main/java/io/nuls/core/core/config/ConfigurationLoader.java index 67e560d4ce..e809ecdb69 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/core/config/ConfigurationLoader.java +++ b/common/nuls-core/src/main/java/io/nuls/core/core/config/ConfigurationLoader.java @@ -1,5 +1,6 @@ package io.nuls.core.core.config; +import io.nuls.core.constant.BaseConstant; import io.nuls.core.core.annotation.Component; import io.nuls.core.core.config.persist.PersistManager; import io.nuls.core.log.Log; @@ -221,6 +222,25 @@ public ConfigItem getConfigItem(String domain, String key) { return item; } + public ConfigItem getConfigItemForCore(String key) { + ConfigItem item = null; + for (String ncDomain : BaseConstant.NULS_CORES_DOMAINS) { + if (!configData.containsKey(ncDomain)) { + continue; + } else { + item = configData.get(ncDomain).get(key); + } + if (item != null) { + return item; + } + } + if (item == null) { + ConfigItem res = getConfigItemForGolbal(key); + return res; + } + return item; + } + public ConfigItem getConfigItemForPersist(String persistDomain, String key) { Map persistConfig = persistConfigData.get(persistDomain); if (persistConfig == null) { diff --git a/common/nuls-core/src/main/java/io/nuls/core/core/ioc/SpringLiteContext.java b/common/nuls-core/src/main/java/io/nuls/core/core/ioc/SpringLiteContext.java index 5d02295a9d..78806cec78 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/core/ioc/SpringLiteContext.java +++ b/common/nuls-core/src/main/java/io/nuls/core/core/ioc/SpringLiteContext.java @@ -25,6 +25,7 @@ package io.nuls.core.core.ioc; import io.nuls.core.basic.InitializingBean; +import io.nuls.core.constant.BaseConstant; import io.nuls.core.core.annotation.*; import io.nuls.core.core.config.ConfigSetting; import io.nuls.core.core.config.ConfigurationLoader; @@ -113,6 +114,8 @@ private static void configurationInjectToBean() { Class cls = BEAN_TYPE_MAP.get(key1); Configuration configuration = cls.getAnnotation(Configuration.class); if (configuration != null) { + String domain = configuration.domain(); + //String mappingDomain = BaseConstant.ROLE_MAPPING.getOrDefault(domain, domain); Set fields = getFieldSet(cls); fields.forEach(field -> { Value annValue = field.getAnnotation(Value.class); @@ -124,9 +127,12 @@ private static void configurationInjectToBean() { boolean readPersist = persist != null; ConfigurationLoader.ConfigItem configItem; if (readPersist) { - configItem = configLoader.getConfigItemForPersist(configuration.domain(), key); + configItem = configLoader.getConfigItemForPersist(domain, key); } else { - configItem = configLoader.getConfigItem(configuration.domain(), key); + configItem = configLoader.getConfigItem(domain, key); + } + if ("nuls-cores".equalsIgnoreCase(domain)) { + configItem = configLoader.getConfigItemForCore(key); } if (configItem == null) { Log.warn("config item :{} not setting", key); @@ -196,8 +202,9 @@ private static void autowireFields() { */ private static void callAfterPropertiesSet() { BEAN_OK_MAP.entrySet().stream() - .sorted((e1, e2) -> - getOrderByClass(e1.getValue().getClass()) > getOrderByClass(e2.getValue().getClass()) ? 1 : -1) +// .sorted((e1, e2) -> +// getOrderByClass(e1.getValue().getClass()) > getOrderByClass(e2.getValue().getClass()) ? 1 : -1) + .sorted(Comparator.comparing(d -> getOrderByClass(d.getValue().getClass()))) .forEach(entry -> { Object bean = entry.getValue(); if (bean instanceof InitializingBean) { diff --git a/common/nuls-core/src/main/java/io/nuls/core/log/Log.java b/common/nuls-core/src/main/java/io/nuls/core/log/Log.java index 82b4f52927..112614b9c6 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/log/Log.java +++ b/common/nuls-core/src/main/java/io/nuls/core/log/Log.java @@ -125,6 +125,10 @@ public static void warn(String msg, Throwable throwable) { BASIC_LOGGER.warn(msg, throwable); } + public static void warn(Throwable throwable) { + BASIC_LOGGER.warn("", throwable); + } + /** * 提供error级别基本的日志输出 * @@ -137,11 +141,13 @@ public static void error(String msg) { public static void error(String msg, Object... objs) { try { - List objStrs = new ArrayList<>(); - for (Object obj: objs) { - if(obj instanceof String){ - objStrs.add((String)obj); - }else{ + List objStrs = new ArrayList<>(); + for (Object obj : objs) { + if (obj instanceof String) { + objStrs.add(obj); + } else if (obj instanceof Throwable) { + objStrs.add(obj); + } else { objStrs.add(JSONUtils.obj2json(obj)); } } diff --git a/common/nuls-core/src/main/java/io/nuls/core/log/logback/NulsLogger.java b/common/nuls-core/src/main/java/io/nuls/core/log/logback/NulsLogger.java index f3f00adb31..7f0f4648af 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/log/logback/NulsLogger.java +++ b/common/nuls-core/src/main/java/io/nuls/core/log/logback/NulsLogger.java @@ -166,11 +166,13 @@ public void error(String msg) { public void error(String msg, Object... objs) { String logContent = getLogTrace() + ":" + msg; try { - List objStrs = new ArrayList<>(); - for (Object obj: objs) { - if(obj instanceof String){ - objStrs.add((String)obj); - }else{ + List objStrs = new ArrayList<>(); + for (Object obj : objs) { + if (obj instanceof String) { + objStrs.add((String) obj); + } else if (obj instanceof Throwable) { + objStrs.add(obj); + } else { objStrs.add(JSONUtils.obj2json(obj)); } } diff --git a/common/nuls-core/src/main/java/io/nuls/core/model/DoubleUtils.java b/common/nuls-core/src/main/java/io/nuls/core/model/DoubleUtils.java index f125a06163..daf2b2247b 100644 --- a/common/nuls-core/src/main/java/io/nuls/core/model/DoubleUtils.java +++ b/common/nuls-core/src/main/java/io/nuls/core/model/DoubleUtils.java @@ -276,7 +276,7 @@ public static BigDecimal mul(BigDecimal bd1, BigDecimal bd2) { * @return 商 */ public static BigDecimal div(BigDecimal bd1, BigDecimal bd2) { - if (bd2.equals(BigDecimal.ZERO)) { + if (bd2.compareTo(BigDecimal.ZERO) == 0) { throw new IllegalArgumentException("除数不能为0！"); } return bd1.divide(bd2, 12, RoundingMode.HALF_UP); diff --git a/config/nuls.beta.ncf b/config/nuls.beta.ncf index 935449c9c1..94bb933345 100755 --- a/config/nuls.beta.ncf +++ b/config/nuls.beta.ncf @@ -121,7 +121,7 @@ syncAddress= [cross-chain] #跨链节点链接的最小值 -minNodeAmount=2 +minNodes=2 #跨链节点链接的最大值 sendHeight=6 #跨链交易拜占庭比例 diff --git a/config/nuls.ncf b/config/nuls.ncf index bdc68b3ebd..2feab83d79 100644 --- a/config/nuls.ncf +++ b/config/nuls.ncf @@ -121,7 +121,7 @@ syncAddress= [cross-chain] #跨链节点链接的最小值 -minNodeAmount=3 +minNodes=3 #跨链节点链接的最大值 sendHeight=6 #跨链交易拜占庭比例 diff --git a/module.ncf b/module.ncf index 7f89ca8a2c..c860990936 100644 --- a/module.ncf +++ b/module.ncf @@ -3,7 +3,7 @@ encoding=UTF-8 language=en logPath=/Users/niels/workspace/nuls-v2/logs logLevel=INFO -dataPath=/Users/niels/workspace/nuls-v2/data +dataPath=/Volumes/Niels-1T/version-data/nuls-data #默认本链ID chainId=1 #地址前缀 @@ -43,7 +43,6 @@ maxOutCount=20 [account] blockAccountManager=NULSd6Hh5e4o3N3y6FnHeGhECFXrETqSzbapx keystoreFolder=/keystore/backup -dependent=protocol-update [block] #区块最大字节数 @@ -62,7 +61,7 @@ singleDownloadTimeout=15000 cachedBlockSizeLimit=20971520 #创世块文件路径(支持绝对路径与相对路径,相对路径相对于此配置文件的目录) genesisBlockPath=genesis-block.json -dependent=cross-chain,protocol-update,smart-contract + [consensus] @@ -90,19 +89,11 @@ initTime=1594483200 deflationRatio=0.4 #通缩间隔时间(单位：S),30天 deflationTimeInterval=2592000 -dependent=protocol-update,smart-contract,cross-chain - -[ledger] -dependent=protocol-update [smart-contract] #合约视图方法调用最大消耗的Gas maxViewGas=100000000 crossTokenSystemContract=NULSd6HgsyGNK1xTcx2GnC9y3Jr1DKd3qL2HS -dependent=protocol-update - -[chain-manager] -dependent=smart-contract,protocol-update [public-service] #public-service模块对外的rpc端口号 @@ -127,14 +118,10 @@ teamAddress=NULSd6Hh6m73yRYCn8ff2jo9qN93bh4GpzFDn communityAddress=NULSd6Hh76ja8dHkTdYvTJS9gEAygiU1uLRGR,NULSd6Hh84g7u61ntrWhrdEMjXvM9STRPxFZx,NULSd6Hh8xn55HeTWKwRAG31fj2eHtq6Aw2Rg syncCoinBase=false syncAddress= -dependent=smart-contract,cross-chain,chain-manager - -[transaction] -dependent=protocol-update,smart-contract [cross-chain] #跨链节点链接的最小值 -minNodeAmount=3 +minNodes=3 #跨链节点链接的最大值 sendHeight=6 #跨链交易拜占庭比例 @@ -147,25 +134,22 @@ verifiers=NULSd6Hge7xHDnvsSpnzbR2gWHd31zJ1How11,NULSd6Hgc5VNP4rF4wxdiXEQKpBKUE4w mainByzantineRatio=66 #主网最大签名数 maxSignatureCount=100 -dependent=protocol-update,smart-contract [protocol-update] #每隔多少个区块统计一次协议占比 interval=1000 -dependent=smart-contract,cross-chain [nuls-api] #httpServer的启动ip serverIp=0.0.0.0 #httpServer的启动port serverPort=8004 -dependent=smart-contract,cross-chain,chain-manager + [nuls-module-web-wallet] apiModuleApi=http://127.0.0.1:8003/ webWalletPort=8006 webWalletHost=0.0.0.0 -dependent=smart-contract,cross-chain [nuls-module-explorer] apiModuleApi=http://127.0.0.1:8003/ diff --git a/module/nuls-account/module.ncf b/module/nuls-account/module.ncf deleted file mode 100644 index 70eb3385e9..0000000000 --- a/module/nuls-account/module.ncf +++ /dev/null @@ -1,16 +0,0 @@ -[JAVA] -APP_NAME=account -MAIN_CLASS=io.nuls.account.AccountBootstrap -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=256 -PrivateDependent=nuls-base-protocol-update - -[Core] -Managed=1 - -[account] -moduleDynamicDependent=protocol-update,smart-contract -#blackHolePublicKey=0298f88c3cae67385ce3cbee00f78816db3e56e566b62bd0f4c5b45f205d3021c3 - - diff --git a/module/nuls-account/pom.xml b/module/nuls-account/pom.xml deleted file mode 100644 index 26d5d5e0eb..0000000000 --- a/module/nuls-account/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-account - - - - nuls-release - nuls-release - https://nexus.nuls.io/repository/nuls-release/ - - - - - io.nuls.sdk - sdk-all - 1.1.4.6 - test - - - - io.nuls.v2 - nuls-base-protocol-update - - - io.nuls.v2 - sdk4j - 1.1.7.RELEASE - test - - - org.mybatis - mybatis - - - io.nuls.v2 - nuls-core-h2 - - - - - - nuls-module-account - - \ No newline at end of file diff --git a/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java b/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java deleted file mode 100644 index c25fc5eba2..0000000000 --- a/module/nuls-account/src/main/java/io/nuls/account/config/AccountConfig.java +++ /dev/null @@ -1,148 +0,0 @@ -package io.nuls.account.config; - -import io.nuls.account.model.bo.config.ConfigBean; -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.core.annotation.Persist; -import io.nuls.core.rpc.model.ModuleE; - -/** - * @Author: zhoulijun - * @Time: 2019-03-14 14:11 - * @Description: 配置文件 - */ -@Component -@Configuration(domain = ModuleE.Constant.ACCOUNT) -@Persist -public class AccountConfig implements ModuleConfig { - - /** - * 编码方式 - */ - private String encoding; - - /** - * 语言 - */ - private String language; - - /** - * key store 存储文件夹 - */ - private String keystoreFolder; - - private int mainChainId; - - private int mainAssetId; - - private int chainId; - - private int assetId; - - private String addressPrefix; - - private String blackHolePublicKey; - - private String blockAccountManager; - - public String getBlockAccountManager() { - return blockAccountManager; - } - - public void setBlockAccountManager(String blockAccountManager) { - this.blockAccountManager = blockAccountManager; - } - - public String getBlackHolePublicKey() { - return blackHolePublicKey; - } - - public void setBlackHolePublicKey(String blackHolePublicKey) { - this.blackHolePublicKey = blackHolePublicKey; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - /** - * ROCK DB 数据库文件存储路径 - */ - private String dataPath; - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getKeystoreFolder() { - return keystoreFolder; - } - - public void setKeystoreFolder(String keystoreFolder) { - this.keystoreFolder = keystoreFolder; - } - - public int getMainChainId() { - return mainChainId; - } - - public void setMainChainId(int mainChainId) { - this.mainChainId = mainChainId; - } - - public int getMainAssetId() { - return mainAssetId; - } - - public void setMainAssetId(int mainAssetId) { - this.mainAssetId = mainAssetId; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getAddressPrefix() { - return addressPrefix; - } - - public void setAddressPrefix(String addressPrefix) { - this.addressPrefix = addressPrefix; - } - - public ConfigBean getChainConfig() { - ConfigBean configBean = new ConfigBean(); - configBean.setAssetId(assetId); - configBean.setChainId(chainId); - return configBean; - } -} diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/call/ContractCall.java b/module/nuls-account/src/main/java/io/nuls/account/rpc/call/ContractCall.java deleted file mode 100644 index e779b619d7..0000000000 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/call/ContractCall.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * MIT License - *

- * Copyright (c) 2017-2019 nuls.io - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - *

- * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package io.nuls.account.rpc.call; - -import io.nuls.account.model.bo.Chain; -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.core.exception.NulsException; -import io.nuls.core.rpc.info.Constants; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.model.message.Response; -import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author: Charlie - * @date: 2019/3/15 - */ -public class ContractCall { - - /** - * 导入账户调用智能合约 - * @param chain - * @param address - * @return - * @throws NulsException - */ - public static boolean invokeAccountContract(Chain chain, String address) throws NulsException { - if (!ModuleHelper.isSupportSmartContract()) { - return true; - } - try { - Map params = new HashMap<>(); - params.put(Constants.VERSION_KEY_STR, "1.0"); - params.put(Constants.CHAIN_ID, chain.getChainId()); - params.put("address", address); - Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, "sc_initial_account_token", params); - return cmdResp.isSuccess(); - } catch (Exception e) { - chain.getLogger().error("Calling remote interface failed. module:{} - interface:{}", ModuleE.SC.abbr, "sc_initial_account_token"); - return false; - } - } -} diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/ConfigService.java b/module/nuls-account/src/main/java/io/nuls/account/storage/ConfigService.java deleted file mode 100644 index 784a258320..0000000000 --- a/module/nuls-account/src/main/java/io/nuls/account/storage/ConfigService.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.account.storage; - -import io.nuls.account.model.bo.config.ConfigBean; - -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author qinyifeng - * @date 2018/12/11 - * */ -public interface ConfigService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param bean 配置类/config bean - * @param chainID 链ID/chain id - * @return 保存是否成功/Is preservation successful? - * @exception - * */ - boolean save(ConfigBean bean, int chainID)throws Exception; - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainID 链ID/chain id - * @return 配置信息类/config bean - * */ - ConfigBean get(int chainID); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainID 链ID/chain id - * @return 删除是否成功/Delete success - * */ - boolean delete(int chainID); - - /** - * 获取当前节点所有的链信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - * */ - Map getList(); -} diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/ConfigServiceImpl.java b/module/nuls-account/src/main/java/io/nuls/account/storage/impl/ConfigServiceImpl.java deleted file mode 100644 index fb6d1b6859..0000000000 --- a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.account.storage.impl; - -import io.nuls.account.constant.AccountConstant; -import io.nuls.account.constant.AccountStorageConstant; -import io.nuls.account.model.bo.config.ConfigBean; -import io.nuls.account.storage.ConfigService; -import io.nuls.account.util.LoggerUtil; -import io.nuls.core.basic.InitializingBean; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.exception.NulsException; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.model.ObjectUtils; -import io.nuls.core.rockdb.model.Entry; -import io.nuls.core.rockdb.service.RocksDBService; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author qinyifeng - * @date 2018/12/11 - */ -@Component -public class ConfigServiceImpl implements ConfigService, InitializingBean { - - @Override - public void afterPropertiesSet() throws NulsException { - } - - @Override - public boolean save(ConfigBean bean, int chainID) throws Exception { - if (bean == null) { - return false; - } - return RocksDBService.put(AccountStorageConstant.DB_NAME_ACCOUNT_CONGIF, ByteUtils.intToBytes(chainID), ObjectUtils.objectToBytes(bean)); - } - - @Override - public ConfigBean get(int chainID) { - try { - byte[] value = RocksDBService.get(AccountStorageConstant.DB_NAME_ACCOUNT_CONGIF, ByteUtils.intToBytes(chainID)); - return ObjectUtils.bytesToObject(value); - } catch (Exception e) { - LoggerUtil.LOG.error(e); - return null; - } - } - - @Override - public boolean delete(int chainID) { - try { - return RocksDBService.delete(AccountStorageConstant.DB_NAME_ACCOUNT_CONGIF, ByteUtils.intToBytes(chainID)); - } catch (Exception e) { - LoggerUtil.LOG.error(e); - return false; - } - } - - @Override - public Map getList() { - try { - List> list = RocksDBService.entryList(AccountStorageConstant.DB_NAME_ACCOUNT_CONGIF); - Map configBeanMap = new HashMap<>(AccountConstant.INIT_CAPACITY_16); - if (list != null) { - for (Entry entry : list) { - int key = ByteUtils.bytesToInt(entry.getKey()); - ConfigBean value = ObjectUtils.bytesToObject(entry.getValue()); - configBeanMap.put(key, value); - } - } - return configBeanMap; - } catch (Exception e) { - LoggerUtil.LOG.error(e); - return null; - } - } -} diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/manager/ConfigManager.java b/module/nuls-account/src/main/java/io/nuls/account/util/manager/ConfigManager.java deleted file mode 100644 index f00b4c3126..0000000000 --- a/module/nuls-account/src/main/java/io/nuls/account/util/manager/ConfigManager.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.account.util.manager; - -import io.nuls.account.model.bo.config.ConfigBean; -import io.nuls.account.model.bo.config.ConfigItem; -import io.nuls.account.storage.ConfigService; -import io.nuls.core.core.ioc.SpringLiteContext; - -import java.lang.reflect.Field; -import java.math.BigInteger; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 共识模块配置文件管理类 - * Consensus Module Profile Management Class - * - * @author tag - * 2018/11/20 - */ -public class ConfigManager { - /** - * 配置参数是否可修改 - * param_name - 是否可修改标识 - */ - private static Map param_modify = new HashMap<>(); - - /** - * 初始化配置信息 - * Initialize configuration information - * - * @param items 配置参数列表 - */ - public static ConfigBean initManager(List items) throws Exception { - ConfigBean bean = new ConfigBean(); - Class beanClass = bean.getClass(); - Field field; - /* - 通过反射设置bean属性值 - Setting bean attribute values by reflection - */ - for (ConfigItem item : items) { - param_modify.put(item.getKey(), item.isReadOnly()); - field = beanClass.getDeclaredField(item.getKey()); - field.setAccessible(true); - if (field.getType().isAssignableFrom(BigInteger.class)) { - field.set(bean, new BigInteger((String) item.getValue())); - } else { - field.set(bean, item.getValue()); - } - } - /* - 保存配置信息到数据库 - Save configuration information to database - */ - ConfigService configService = SpringLiteContext.getBean(ConfigService.class); - boolean saveSuccess = configService.save(bean, bean.getChainId()); - if (saveSuccess) { - return bean; - } - return null; - } -} diff --git a/module/nuls-account/src/main/resources/languages/en.properties b/module/nuls-account/src/main/resources/languages/en.properties deleted file mode 100644 index 9efe5af7bc..0000000000 --- a/module/nuls-account/src/main/resources/languages/en.properties +++ /dev/null @@ -1,57 +0,0 @@ -ac_0000=Password is wrong -ac_0001=Account does not exist -ac_0002=The account has been encrypted. -ac_0003=Account already exists -ac_0004=Address wrong -ac_0005=Alias already exists. -ac_0006=Alias is not exist -ac_0007=The account already set an alias -ac_0008=The account is not encrypted -ac_0009=There is another AliasTransaction set the same alias -ac_0010=Contains encrypted accounts -ac_0011=Contains unencrypted accounts -ac_0012=The private key is wrong -ac_0013=Delete alias error -ac_0014=The AccountKeystore file does not exist -ac_0015=The AccountKeystore file was damaged -ac_0016=The alias format wrong -ac_0017=The password format wrong -ac_0018=Decrypt account error -ac_0019=Account is encrypted and locked -ac_0020=Remark is too long -ac_0021=input is too small -ac_0022=must burn a NULS -ac_0023=sign count too large -ac_0024=is not current chain address -ac_0025=is multi signature address -ac_0026=is not multi signature address -ac_0027=asset not exist -ac_0028=insufficient balance -ac_0029=insufficient fee -ac_0030=The chain does not exist -ac_0031=CoinData data is incomplete -ac_0032=Transaction is not exist -ac_0033=Transaction coinData not found -ac_0034=Transaction data validation error -ac_0035=Transaction type error -ac_0036=Invalid transaction or unavailable in current version -ac_0037=The transaction data is too big -ac_0038=Transaction payer information does not exist -ac_0039=Transaction payee information does not exist -ac_0040=The chain id is error -ac_0041=The asset id is error -ac_0042=The signature address of the transaction does not match the coinfrom address -ac_0043=the address already signed the transaction -ac_0044=CoinTo has duplicate account assets -ac_0045=Save alias error -ac_0046=amount too small -ac_0047=Black hole addresses prohibit token spending -ac_0048=Remote response data not found -ac_0049=Transaction coinFrom underpayment -ac_0050=There can only be one multi-signature address -ac_0051=CoinData cannot have contract address -ac_0052=The contract address cannot participate in the creation of a multi-signature account -ac_0053=The multi-signature address cannot participate in the creation of a multi-signature account -ac_0054=The contract address cannot set alias -ac_0055=Multi-Sign account does not exist -ac_0056=Create Multi-Sign account failed diff --git a/module/nuls-account/src/main/resources/module.json b/module/nuls-account/src/main/resources/module.json deleted file mode 100644 index 6e6e74563c..0000000000 --- a/module/nuls-account/src/main/resources/module.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "chainId": 1, - "assetId": 1, - "mainChainId": 1, - "mainAssetId": 1, - "language": "zh-CHS", - "encoding": "UTF-8", - "keystoreFolder": "/keystore/backup", - "dataPath":"/data", - "blackHolePublicKey":"000000000000000000000000000000000000000000000000000000000000000000", - "addressPrefix":"NULS" -} \ No newline at end of file diff --git a/module/nuls-account/src/main/resources/protocol-config.json b/module/nuls-account/src/main/resources/protocol-config.json deleted file mode 100644 index 33b0a4c278..0000000000 --- a/module/nuls-account/src/main/resources/protocol-config.json +++ /dev/null @@ -1,86 +0,0 @@ -[ - { - "version": "13", - "extend": "12", - "validTxs": [ - { - "type": "65", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AccountForTransferOnContractCallProcessorV13" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "12", - "extend": "11", - "validTxs": [ - { - "type": "63", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AccountLockProcessorV12" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "11", - "extend": "1", - "validTxs": [ - { - "type": "63", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AccountLockProcessorV11" - }, - { - "type": "64", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AccountUnlockProcessorV11" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "1", - "extend": "", - "validTxs": [ - { - "type": "2", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "TransferProcessorV1" - }, - { - "type": "3", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AliasProcessorV1" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-api/module.ncf b/module/nuls-api/module.ncf index ab34df996e..b5fdc5de2a 100644 --- a/module/nuls-api/module.ncf +++ b/module/nuls-api/module.ncf @@ -15,7 +15,7 @@ chainId=1 assetsId=1 [nuls-api] -moduleDynamicDependent=smart-contract,cross-chain,chain-manager +moduleDynamicDependent=nuls-cores #httpServer的启动ip serverIp=0.0.0.0 #httpServer的启动port diff --git a/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java b/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java index 3f383e552c..f2ad5576c5 100644 --- a/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java +++ b/module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java @@ -109,13 +109,14 @@ private static void initRpcServer(Map co @Override public Module[] declareDependent() { return new Module[]{ - new Module(ModuleE.CS.abbr, ROLE), - new Module(ModuleE.BL.abbr, ROLE), - new Module(ModuleE.AC.abbr, ROLE), - new Module(ModuleE.TX.abbr, ROLE), - new Module(ModuleE.LG.abbr, ROLE), - new Module(ModuleE.CC.abbr, ROLE), - new Module(ModuleE.NW.abbr, ROLE) + new Module(ModuleE.NC.abbr, ROLE) + //new Module(ModuleE.CS.abbr, ROLE), + //new Module(ModuleE.BL.abbr, ROLE), + //new Module(ModuleE.AC.abbr, ROLE), + //new Module(ModuleE.TX.abbr, ROLE), + //new Module(ModuleE.LG.abbr, ROLE), + //new Module(ModuleE.CC.abbr, ROLE), + //new Module(ModuleE.NW.abbr, ROLE) }; } @@ -133,8 +134,8 @@ public boolean doStart() { @Override public void onDependenciesReady(Module module) { Log.info("dependencies [{}] ready", module.getName()); - if (ModuleE.LG.abbr.equals(module.getName())) { - Log.info("onDependenciesReady ledger"); + if (ModuleE.NC.abbr.equals(module.getName())) { + Log.info("onDependenciesReady nuls cores"); ledgerAssetCache.initial(config.getChainId()); } diff --git a/module/nuls-block/module.ncf b/module/nuls-block/module.ncf deleted file mode 100644 index d977033e96..0000000000 --- a/module/nuls-block/module.ncf +++ /dev/null @@ -1,13 +0,0 @@ -[JAVA] -APP_NAME=block -MAIN_CLASS=io.nuls.block.BlockBootstrap -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=512 -PrivateDependent=nuls-base-protocol-update - -[Core] -Managed=1 - -[block] -moduleDynamicDependent=protocol-update,cross-chain,smart-contract diff --git a/module/nuls-block/pom.xml b/module/nuls-block/pom.xml deleted file mode 100644 index 9ece0a1003..0000000000 --- a/module/nuls-block/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-block - - 4.2 - - - - - - io.nuls.v2 - nuls-base-protocol-update - - - - - nuls-module-block - - - \ No newline at end of file diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/BlockConfig.java b/module/nuls-block/src/main/java/io/nuls/block/model/BlockConfig.java deleted file mode 100644 index 0d8e1e974b..0000000000 --- a/module/nuls-block/src/main/java/io/nuls/block/model/BlockConfig.java +++ /dev/null @@ -1,177 +0,0 @@ -package io.nuls.block.model; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; - -import java.io.File; - -/** - * 配置信息,所有时间配置默认单位为毫秒 - * - * @author captain - * @version 1.0 - * @date 18-11-20 上午11:01 - */ -@Component -@Configuration(domain = ModuleE.Constant.BLOCK) -public class BlockConfig extends ChainParameters implements ModuleConfig { - - /** - * 国际化 - */ - private String language; - - /** - * 分叉链监视线程执行间隔 - */ - private int forkChainsMonitorInterval; - - /** - * 孤儿链监视线程执行间隔 - */ - private int orphanChainsMonitorInterval; - - /** - * 孤儿链维护线程执行间隔 - */ - private int orphanChainsMaintainerInterval; - - /** - * 数据库监视线程执行间隔 - */ - private int storageSizeMonitorInterval; - - /** - * 网络监视线程执行间隔 - */ - private int networkResetMonitorInterval; - - /** - * 节点数量监控线程执行间隔 - */ - private int nodesMonitorInterval; - - /** - * TxGroup请求器线程执行间隔 - */ - private int txGroupRequestorInterval; - - /** - * TxGroup请求器任务执行延时 - */ - private int txGroupTaskDelay; - - private String dataPath; - - /** - * 启动后自动回滚多少个区块 - */ - private int testAutoRollbackAmount; - - /** - * 回滚到指定高度 - */ - private int rollbackHeight; - - public int getNodesMonitorInterval() { - return nodesMonitorInterval; - } - - public void setNodesMonitorInterval(int nodesMonitorInterval) { - this.nodesMonitorInterval = nodesMonitorInterval; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public int getForkChainsMonitorInterval() { - return forkChainsMonitorInterval; - } - - public void setForkChainsMonitorInterval(int forkChainsMonitorInterval) { - this.forkChainsMonitorInterval = forkChainsMonitorInterval; - } - - public int getOrphanChainsMonitorInterval() { - return orphanChainsMonitorInterval; - } - - public void setOrphanChainsMonitorInterval(int orphanChainsMonitorInterval) { - this.orphanChainsMonitorInterval = orphanChainsMonitorInterval; - } - - public int getOrphanChainsMaintainerInterval() { - return orphanChainsMaintainerInterval; - } - - public void setOrphanChainsMaintainerInterval(int orphanChainsMaintainerInterval) { - this.orphanChainsMaintainerInterval = orphanChainsMaintainerInterval; - } - - public int getStorageSizeMonitorInterval() { - return storageSizeMonitorInterval; - } - - public void setStorageSizeMonitorInterval(int storageSizeMonitorInterval) { - this.storageSizeMonitorInterval = storageSizeMonitorInterval; - } - - public int getNetworkResetMonitorInterval() { - return networkResetMonitorInterval; - } - - public void setNetworkResetMonitorInterval(int networkResetMonitorInterval) { - this.networkResetMonitorInterval = networkResetMonitorInterval; - } - - public int getTxGroupRequestorInterval() { - return txGroupRequestorInterval; - } - - public void setTxGroupRequestorInterval(int txGroupRequestorInterval) { - this.txGroupRequestorInterval = txGroupRequestorInterval; - } - - public int getTxGroupTaskDelay() { - return txGroupTaskDelay; - } - - public void setTxGroupTaskDelay(int txGroupTaskDelay) { - this.txGroupTaskDelay = txGroupTaskDelay; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public int getTestAutoRollbackAmount() { - return testAutoRollbackAmount; - } - - public void setTestAutoRollbackAmount(int testAutoRollbackAmount) { - this.testAutoRollbackAmount = testAutoRollbackAmount; - } - - public String getDataFolder() { - return dataPath + File.separator + ModuleE.BL.name; - } - - public int getRollbackHeight() { - return rollbackHeight; - } - - public void setRollbackHeight(int rollbackHeight) { - this.rollbackHeight = rollbackHeight; - } -} diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/ChainParameters.java b/module/nuls-block/src/main/java/io/nuls/block/model/ChainParameters.java deleted file mode 100644 index d8e99aeafa..0000000000 --- a/module/nuls-block/src/main/java/io/nuls/block/model/ChainParameters.java +++ /dev/null @@ -1,464 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.block.model; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.base.basic.NulsOutputStreamBuffer; -import io.nuls.base.data.BaseNulsData; -import io.nuls.core.exception.NulsException; -import io.nuls.core.parse.SerializeUtils; - -import java.io.IOException; - -/** - * 链的运行时参数 - * - * @author captain - * @version 1.0 - * @date 19-2-26 上午10:49 - */ -public class ChainParameters extends BaseNulsData { - - /** - * 链ID - */ - private int chainId; - /** - * 默认资产ID - */ - private int assetId; - /** - * 区块大小阈值 - */ - private long blockMaxSize; - /** - * 网络重置阈值 - */ - private long resetTime; - /** - * 分叉链比主链高几个区块就进行链切换 - */ - private byte chainSwtichThreshold; - /** - * 分叉链、孤儿链区块最大缓存数量 - */ - private int cacheSize; - /** - * 接收新区块的范围 - */ - private int heightRange; - /** - * 每次回滚区块最大值 - */ - private int maxRollback; - /** - * 一致节点比例 - */ - private byte consistencyNodePercent; - /** - * 系统运行最小节点数 - */ - private byte minNodeAmount; - /** - * 每次从一个节点下载多少区块 - */ - private byte downloadNumber; - /** - * 区块头中扩展字段的最大长度 - */ - private int extendMaxSize; - /** - * 为阻止恶意节点提前出块,设置此参数 - * 区块时间戳大于当前时间多少就丢弃该区块 - */ - private int validBlockInterval; - /** - * 系统正常运行时最多缓存多少个从别的节点接收到的小区块 - */ - private byte smallBlockCache; - /** - * 孤儿链最大年龄 - */ - private byte orphanChainMaxAge; - /** - * 日志级别 - */ - private String logLevel; - /** - * 下载单个区块的超时时间 - */ - private int singleDownloadTimeout; - - /** - * 等待网络稳定的时间间隔 - */ - private int waitNetworkInterval; - - /** - * 创世区块配置文件路径 - */ - private String genesisBlockPath; - - /** - * 区块同步过程中缓存的区块字节数上限 - */ - private long cachedBlockSizeLimit; - - public ChainParameters(int chainId, int assetId, long blockMaxSize, long resetTime, byte chainSwtichThreshold, int cacheSize, int heightRange, int maxRollback, byte consistencyNodePercent, byte minNodeAmount, byte downloadNumber, int extendMaxSize, int validBlockInterval, byte smallBlockCache, byte orphanChainMaxAge, String logLevel, int singleDownloadTimeout, int waitNetworkInterval, String genesisBlockPath, long cachedBlockSizeLimit) { - this.chainId = chainId; - this.assetId = assetId; - this.blockMaxSize = blockMaxSize; - this.resetTime = resetTime; - this.chainSwtichThreshold = chainSwtichThreshold; - this.cacheSize = cacheSize; - this.heightRange = heightRange; - this.maxRollback = maxRollback; - this.consistencyNodePercent = consistencyNodePercent; - this.minNodeAmount = minNodeAmount; - this.downloadNumber = downloadNumber; - this.extendMaxSize = extendMaxSize; - this.validBlockInterval = validBlockInterval; - this.smallBlockCache = smallBlockCache; - this.orphanChainMaxAge = orphanChainMaxAge; - this.logLevel = logLevel; - this.singleDownloadTimeout = singleDownloadTimeout; - this.waitNetworkInterval = waitNetworkInterval; - this.genesisBlockPath = genesisBlockPath; - this.cachedBlockSizeLimit = cachedBlockSizeLimit; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public ChainParameters() { - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public long getBlockMaxSize() { - return blockMaxSize; - } - - public void setBlockMaxSize(long blockMaxSize) { - this.blockMaxSize = blockMaxSize; - } - - public long getResetTime() { - return resetTime; - } - - public void setResetTime(long resetTime) { - this.resetTime = resetTime; - } - - public byte getChainSwtichThreshold() { - return chainSwtichThreshold; - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } - - public int getHeightRange() { - return heightRange; - } - - public void setHeightRange(int heightRange) { - this.heightRange = heightRange; - } - - public int getMaxRollback() { - return maxRollback; - } - - public void setMaxRollback(int maxRollback) { - this.maxRollback = maxRollback; - } - - public void setChainSwtichThreshold(byte chainSwtichThreshold) { - this.chainSwtichThreshold = chainSwtichThreshold; - } - - public byte getConsistencyNodePercent() { - return consistencyNodePercent; - } - - public void setConsistencyNodePercent(byte consistencyNodePercent) { - this.consistencyNodePercent = consistencyNodePercent; - } - - public byte getMinNodeAmount() { - return minNodeAmount; - } - - public void setMinNodeAmount(byte minNodeAmount) { - this.minNodeAmount = minNodeAmount; - } - - public byte getDownloadNumber() { - return downloadNumber; - } - - public int getExtendMaxSize() { - return extendMaxSize; - } - - public void setExtendMaxSize(int extendMaxSize) { - this.extendMaxSize = extendMaxSize; - } - - public int getValidBlockInterval() { - return validBlockInterval; - } - - public void setValidBlockInterval(int validBlockInterval) { - this.validBlockInterval = validBlockInterval; - } - - public void setDownloadNumber(byte downloadNumber) { - this.downloadNumber = downloadNumber; - } - - public byte getSmallBlockCache() { - return smallBlockCache; - } - - public void setSmallBlockCache(byte smallBlockCache) { - this.smallBlockCache = smallBlockCache; - } - - public byte getOrphanChainMaxAge() { - return orphanChainMaxAge; - } - - public String getLogLevel() { - return logLevel; - } - - public void setLogLevel(String logLevel) { - this.logLevel = logLevel; - } - - public void setOrphanChainMaxAge(byte orphanChainMaxAge) { - this.orphanChainMaxAge = orphanChainMaxAge; - } - - public int getSingleDownloadTimeout() { - return singleDownloadTimeout; - } - - public int getWaitNetworkInterval() { - return waitNetworkInterval; - } - - public void setWaitNetworkInterval(int waitNetworkInterval) { - this.waitNetworkInterval = waitNetworkInterval; - } - - public void setSingleDownloadTimeout(int singleDownloadTimeout) { - this.singleDownloadTimeout = singleDownloadTimeout; - } - - public String getGenesisBlockPath() { - return genesisBlockPath; - } - - public void setGenesisBlockPath(String genesisBlockPath) { - this.genesisBlockPath = genesisBlockPath; - } - - public long getCachedBlockSizeLimit() { - return cachedBlockSizeLimit; - } - - public void setCachedBlockSizeLimit(long cachedBlockSizeLimit) { - this.cachedBlockSizeLimit = cachedBlockSizeLimit; - } - - @Override - protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { - stream.writeUint16(chainId); - stream.writeUint16(assetId); - stream.writeUint32(blockMaxSize); - stream.writeUint32(resetTime); - stream.writeByte(chainSwtichThreshold); - stream.writeUint16(cacheSize); - stream.writeUint16(heightRange); - stream.writeUint16(maxRollback); - stream.writeByte(consistencyNodePercent); - stream.writeByte(minNodeAmount); - stream.writeByte(downloadNumber); - stream.writeUint16(extendMaxSize); - stream.writeUint16(validBlockInterval); - stream.writeByte(smallBlockCache); - stream.writeByte(orphanChainMaxAge); - stream.writeString(logLevel); - stream.writeUint16(singleDownloadTimeout); - stream.writeUint16(waitNetworkInterval); - stream.writeString(genesisBlockPath); - stream.writeUint32(cachedBlockSizeLimit); - } - - @Override - public void parse(NulsByteBuffer byteBuffer) throws NulsException { - this.chainId = byteBuffer.readUint16(); - this.assetId = byteBuffer.readUint16(); - this.blockMaxSize = byteBuffer.readUint32(); - this.resetTime = byteBuffer.readUint32(); - this.chainSwtichThreshold = byteBuffer.readByte(); - this.cacheSize = byteBuffer.readUint16(); - this.heightRange = byteBuffer.readUint16(); - this.maxRollback = byteBuffer.readUint16(); - this.consistencyNodePercent = byteBuffer.readByte(); - this.minNodeAmount = byteBuffer.readByte(); - this.downloadNumber = byteBuffer.readByte(); - this.extendMaxSize = byteBuffer.readUint16(); - this.validBlockInterval = byteBuffer.readUint16(); - this.smallBlockCache = byteBuffer.readByte(); - this.orphanChainMaxAge = byteBuffer.readByte(); - this.logLevel = byteBuffer.readString(); - this.singleDownloadTimeout = byteBuffer.readUint16(); - this.waitNetworkInterval = byteBuffer.readUint16(); - this.genesisBlockPath = byteBuffer.readString(); - this.cachedBlockSizeLimit = byteBuffer.readUint32(); - } - - @Override - public int size() { - int size = 36; - size += SerializeUtils.sizeOfString(logLevel); - size += SerializeUtils.sizeOfString(genesisBlockPath); - return size; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - ChainParameters that = (ChainParameters) o; - - if (chainId != that.chainId) { - return false; - } - if (assetId != that.assetId) { - return false; - } - if (blockMaxSize != that.blockMaxSize) { - return false; - } - if (resetTime != that.resetTime) { - return false; - } - if (chainSwtichThreshold != that.chainSwtichThreshold) { - return false; - } - if (cacheSize != that.cacheSize) { - return false; - } - if (heightRange != that.heightRange) { - return false; - } - if (maxRollback != that.maxRollback) { - return false; - } - if (consistencyNodePercent != that.consistencyNodePercent) { - return false; - } - if (minNodeAmount != that.minNodeAmount) { - return false; - } - if (downloadNumber != that.downloadNumber) { - return false; - } - if (extendMaxSize != that.extendMaxSize) { - return false; - } - if (validBlockInterval != that.validBlockInterval) { - return false; - } - if (smallBlockCache != that.smallBlockCache) { - return false; - } - if (orphanChainMaxAge != that.orphanChainMaxAge) { - return false; - } - if (singleDownloadTimeout != that.singleDownloadTimeout) { - return false; - } - if (waitNetworkInterval != that.waitNetworkInterval) { - return false; - } - if (cachedBlockSizeLimit != that.cachedBlockSizeLimit) { - return false; - } - if (logLevel != null ? !logLevel.equals(that.logLevel) : that.logLevel != null) { - return false; - } - return genesisBlockPath != null ? genesisBlockPath.equals(that.genesisBlockPath) : that.genesisBlockPath == null; - } - - @Override - public int hashCode() { - int result = chainId; - result = 31 * result + assetId; - result = 31 * result + (int) (blockMaxSize ^ (blockMaxSize >>> 32)); - result = 31 * result + (int) (resetTime ^ (resetTime >>> 32)); - result = 31 * result + (int) chainSwtichThreshold; - result = 31 * result + cacheSize; - result = 31 * result + heightRange; - result = 31 * result + maxRollback; - result = 31 * result + (int) consistencyNodePercent; - result = 31 * result + (int) minNodeAmount; - result = 31 * result + (int) downloadNumber; - result = 31 * result + extendMaxSize; - result = 31 * result + validBlockInterval; - result = 31 * result + (int) smallBlockCache; - result = 31 * result + (int) orphanChainMaxAge; - result = 31 * result + (logLevel != null ? logLevel.hashCode() : 0); - result = 31 * result + singleDownloadTimeout; - result = 31 * result + waitNetworkInterval; - result = 31 * result + (genesisBlockPath != null ? genesisBlockPath.hashCode() : 0); - result = 31 * result + (int) (cachedBlockSizeLimit ^ (cachedBlockSizeLimit >>> 32)); - return result; - } -} diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/ParametersStorageService.java b/module/nuls-block/src/main/java/io/nuls/block/storage/ParametersStorageService.java deleted file mode 100644 index d02a7c7e44..0000000000 --- a/module/nuls-block/src/main/java/io/nuls/block/storage/ParametersStorageService.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.block.storage; - -import io.nuls.block.model.ChainParameters; - -import java.util.List; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author tag - * 2018/11/8 - */ -public interface ParametersStorageService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param chainParameters 配置类/config bean - * @param chainId 链Id/chain id - * @return 保存是否成功/Is preservation successful? - * @throws - */ - boolean save(ChainParameters chainParameters, int chainId); - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainId 链Id/chain id - * @return 配置信息类/config bean - */ - ChainParameters get(int chainId); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainId 链Id/chain id - * @return 删除是否成功/Delete success - */ - boolean delete(int chainId); - - /** - * 获取当前节点所有的链信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - */ - List getList(); - - /** - * 保存协议配置信息 - * - * @param protocolConfigs 配置文件信息(json) - * @param chainId 链Id/chain id - * @return - */ - boolean saveProtocolConfigJson(String protocolConfigs, int chainId); - - /** - * 获取协议配置信息 - * - * @param chainId 链Id/chain id - * @return - */ - String getProtocolConfigJson(int chainId); - - /** - * 删除协议配置信息 - * - * @param chainId 链Id/chain id - * @return - */ - boolean deleteProtocolConfigJson(int chainId); - - /** - * 获取协议配置信息列表 - * - * @return - */ - List getProtocolConfigJsonList(); -} diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/impl/ParametersStorageServiceImpl.java b/module/nuls-block/src/main/java/io/nuls/block/storage/impl/ParametersStorageServiceImpl.java deleted file mode 100644 index 3381098d33..0000000000 --- a/module/nuls-block/src/main/java/io/nuls/block/storage/impl/ParametersStorageServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.block.storage.impl; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.block.constant.Constant; -import io.nuls.block.model.ChainParameters; -import io.nuls.block.storage.ParametersStorageService; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.rockdb.service.RocksDBService; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static io.nuls.block.utils.LoggerUtil.COMMON_LOG; - -/** - * 链运行参数服务实现 - * - * @author captain - * @version 1.0 - * @date 19-2-26 上午10:50 - */ -@Component -public class ParametersStorageServiceImpl implements ParametersStorageService { - @Override - public boolean save(ChainParameters chainParameters, int chainId) { - byte[] bytes; - try { - bytes = chainParameters.serialize(); - return RocksDBService.put(Constant.CHAIN_PARAMETERS, ByteUtils.intToBytes(chainId), bytes); - } catch (Exception e) { - COMMON_LOG.error("", e); - return false; - } - } - - @Override - public ChainParameters get(int chainId) { - try { - ChainParameters po = new ChainParameters(); - byte[] bytes = RocksDBService.get(Constant.CHAIN_PARAMETERS, ByteUtils.intToBytes(chainId)); - po.parse(new NulsByteBuffer(bytes)); - return po; - } catch (Exception e) { - COMMON_LOG.error("", e); - return null; - } - } - - @Override - public boolean delete(int chainId) { - try { - return RocksDBService.delete(Constant.CHAIN_PARAMETERS, ByteUtils.intToBytes(chainId)); - } catch (Exception e) { - COMMON_LOG.error("", e); - return false; - } - } - - @Override - public List getList() { - try { - var pos = new ArrayList(); - List valueList = RocksDBService.valueList(Constant.CHAIN_PARAMETERS); - if (valueList == null) { - return Collections.emptyList(); - } - for (byte[] bytes : valueList) { - var po = new ChainParameters(); - po.parse(new NulsByteBuffer(bytes)); - pos.add(po); - } - return pos; - } catch (Exception e) { - COMMON_LOG.error("", e); - return Collections.emptyList(); - } - } - - @Override - public boolean saveProtocolConfigJson(String json, int chainId) { - byte[] bytes; - try { - bytes = json.getBytes(); - return RocksDBService.put(Constant.PROTOCOL_CONFIG, ByteUtils.intToBytes(chainId), bytes); - } catch (Exception e) { - COMMON_LOG.error("", e); - return false; - } - } - - @Override - public String getProtocolConfigJson(int chainId) { - try { - byte[] bytes = RocksDBService.get(Constant.PROTOCOL_CONFIG, ByteUtils.intToBytes(chainId)); - return new String(bytes); - } catch (Exception e) { - COMMON_LOG.error("", e); - return null; - } - } - - @Override - public boolean deleteProtocolConfigJson(int chainId) { - try { - return RocksDBService.delete(Constant.PROTOCOL_CONFIG, ByteUtils.intToBytes(chainId)); - } catch (Exception e) { - COMMON_LOG.error("", e); - return false; - } - } - - @Override - public List getProtocolConfigJsonList() { - try { - var pos = new ArrayList(); - List valueList = RocksDBService.valueList(Constant.CHAIN_PARAMETERS); - for (byte[] bytes : valueList) { - pos.add(new String(bytes)); - } - return pos; - } catch (Exception e) { - COMMON_LOG.error("", e); - return Collections.emptyList(); - } - } -} diff --git a/module/nuls-block/src/main/resources/languages/en.properties b/module/nuls-block/src/main/resources/languages/en.properties deleted file mode 100644 index 1c2eaf0358..0000000000 --- a/module/nuls-block/src/main/resources/languages/en.properties +++ /dev/null @@ -1,18 +0,0 @@ -bl_0001=Chain switch failed -bl_0002=The local genesis block differ from network -bl_0003=Error occur when init local block -bl_0004=Error occur when saving genesis block -bl_0005=Update latest height error -bl_0006=Remove block header error -bl_0007=Transactions rollback error -bl_0008=Consensus rollback notice error -bl_0009=Protocol save notice error -bl_0010=Consensus save notice error -bl_0011=Transactions save error -bl_0012=Save block header error -bl_0013=Receive out of range block -bl_0014=Receive duplicate main block -bl_0015=Receive fork block -bl_0016=Receive irrelevant block -bl_0017=Block verify error -bl_0018=An exception occurred during block synchronization \ No newline at end of file diff --git a/module/nuls-block/src/main/resources/module.json b/module/nuls-block/src/main/resources/module.json deleted file mode 100644 index 5e679c76c6..0000000000 --- a/module/nuls-block/src/main/resources/module.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "forkChainsMonitorInterval": 10000, - "orphanChainsMonitorInterval": 10000, - "orphanChainsMaintainerInterval": 3000, - "storageSizeMonitorInterval": 180000, - "networkResetMonitorInterval": 300000, - "nodesMonitorInterval": 5000, - "txGroupRequestorInterval": 1000, - "txGroupTaskDelay": 3000, - "testAutoRollbackAmount": 0, - "rollbackHeight": 878000, - "blockMaxSize": 5242880, - "resetTime": 1800000, - "chainSwtichThreshold": 3, - "cacheSize": 1000, - "heightRange": 1000, - "maxRollback": 1000, - "consistencyNodePercent": 60, - "minNodeAmount": 1, - "downloadNumber": 10, - "extendMaxSize": 1024, - "validBlockInterval": 60000, - "smallBlockCache": 6, - "orphanChainMaxAge": 10, - "singleDownloadTimeout": 10000, - "waitNetworkInterval": 5000, - "cachedBlockSizeLimit": 20971520, - "genesisBlockPath": "" -} \ No newline at end of file diff --git a/module/nuls-block/src/main/resources/protocol-config.json b/module/nuls-block/src/main/resources/protocol-config.json deleted file mode 100644 index 9728594107..0000000000 --- a/module/nuls-block/src/main/resources/protocol-config.json +++ /dev/null @@ -1,51 +0,0 @@ -[ - { - "version": "1", - "extend": "", - "validTxs": [], - "validMsgs": [ - { - "name": "io.nuls.block.message.BlockMessage", - "protocolCmd": "block", - "handlers": "BlockHandlerV1" - }, - { - "name": "io.nuls.block.message.CompleteMessage", - "protocolCmd": "complete", - "handlers": "CompleteHandlerV1" - }, - { - "name": "io.nuls.block.message.HashListMessage", - "protocolCmd": "getTxs", - "handlers": "GetTxGroupHandlerV1" - }, - { - "name": "io.nuls.block.message.HashMessage", - "protocolCmd": "getBlock,forward,getsBlock", - "handlers": "ForwardSmallBlockHandlerV1,GetBlockHandlerV1,GetSmallBlockHandlerV1" - }, - { - "name": "io.nuls.block.message.HeightRangeMessage", - "protocolCmd": "getBlocks", - "handlers": "GetBlocksHandlerV1" - }, - { - "name": "io.nuls.block.message.HeightMessage", - "protocolCmd": "getBlockH", - "handlers": "GetBlockByHeightHandlerV1" - }, - { - "name": "io.nuls.block.message.SmallBlockMessage", - "protocolCmd": "sBlock", - "handlers": "SmallBlockHandlerV1" - }, - { - "name": "io.nuls.block.message.TxGroupMessage", - "protocolCmd": "txs", - "handlers": "TxGroupHandlerV1" - } - ], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-block/src/test/java/io/nuls/block/model/ChainParametersTest.java b/module/nuls-block/src/test/java/io/nuls/block/model/ChainParametersTest.java deleted file mode 100644 index f30943df69..0000000000 --- a/module/nuls-block/src/test/java/io/nuls/block/model/ChainParametersTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.nuls.block.model; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.core.exception.NulsException; -import org.junit.Assert; -import org.junit.Test; - -import java.io.IOException; - -public class ChainParametersTest { - - @Test - public void name() throws IOException, NulsException { - ChainParameters parameters = new ChainParameters(2, 1, 5242880, 1800000, (byte) 3, 1000, 1000, 1000, (byte) 60, (byte) 1, (byte) 10, 1024, 60000, (byte) 6, (byte) 10, "INFO", 15000, 5000, "", 20971520); - byte[] bytes = parameters.serialize(); - - ChainParameters p = new ChainParameters(); - p.parse(new NulsByteBuffer(bytes)); - - Assert.assertEquals(parameters, p); - } -} \ No newline at end of file diff --git a/module/nuls-chain-manager/.gitignore b/module/nuls-chain-manager/.gitignore deleted file mode 100644 index 15bc6dcbeb..0000000000 --- a/module/nuls-chain-manager/.gitignore +++ /dev/null @@ -1,118 +0,0 @@ - -# Created by https://www.gitignore.io/api/macos,maven,jetbrains+iml - -### JetBrains+iml ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/dictionaries - -# Sensitive or high-churn files: -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.xml -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml - -# Gradle: -.idea/**/gradle.xml -.idea/**/libraries - -# CMake -cmake-build-debug/ - -# Mongo Explorer plugin: -.idea/**/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Ruby plugin and RubyMine -/.rakeTasks - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -### JetBrains+iml Patch ### -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -### JetBrains+all Patch ### -# Ignores the whole idea folder -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 - -.idea/ - -### macOS ### -*.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties - -# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) -!/.mvn/wrapper/maven-wrapper.jar - -# End of https://www.gitignore.io/api/macos,maven,jetbrains+iml - -# Nuls output -# log -logs/ -/data \ No newline at end of file diff --git a/module/nuls-chain-manager/module.ncf b/module/nuls-chain-manager/module.ncf deleted file mode 100644 index edec48b745..0000000000 --- a/module/nuls-chain-manager/module.ncf +++ /dev/null @@ -1,14 +0,0 @@ -[JAVA] -APP_NAME=chain-manager -VERSION=1.0.0 -MAIN_CLASS=io.nuls.chain.ChainManagerBootstrap -JOPT_XMS=256 -JOPT_XMX=256 -PrivateDependent=nuls-base-protocol-update - -[Core] -Managed=1 - -[chain-manager] -moduleDynamicDependent=protocol-update,smart-contract -blackHolePublicKey=000000000000000000000000000000000000000000000000000000000000000000 diff --git a/module/nuls-chain-manager/pom.xml b/module/nuls-chain-manager/pom.xml deleted file mode 100644 index 043aab501e..0000000000 --- a/module/nuls-chain-manager/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-chain-manager - - - io.nuls.v2 - nuls-base-protocol-update - - - - nuls-module-chain - - \ No newline at end of file diff --git a/module/nuls-chain-manager/readme.md b/module/nuls-chain-manager/readme.md deleted file mode 100644 index ab593761bf..0000000000 --- a/module/nuls-chain-manager/readme.md +++ /dev/null @@ -1,59 +0,0 @@ -# 链管理模块 - -## 为什么要有《链管理》模块 - -在NULS 1.0中，只有一条链（NULS主网），因此不需要链管理模块。 - -在NULS 2.0中，NULS主网上可以注册其他友链信息，包括: - -- NULS生态圈中的链：与NULS主网使用同一套代码衍生出来。 -- 其他链：比特币、以太坊等 - -《链管理》模块用来管理所有加入NULS主网的友链的信息 - -名词解释： - -- NULS主网：不同于NULS 1.0，是独立运行的另一条链，也称之为NULS 2.0。 - 《链管理》是NULS主网的其中一个模块 -- 友链：在NULS主网上注册的其他链 - -假设1：友链A，其拥有资产A - -假设2：友链B，其拥有资产B - -- 跨链交易： - - 友链A把资产A转到友链B - - 友链B内部转移资产A - - 友链B把资产A转回到友链A - - 友链B把资产A转到其他友链（C,D等） -- 非跨链交易： - - 友链A内部转移资产A - - 友链B内部转移资产B - -备注：不论链内资产，还是链外资产，只要资产跨链进行交易，就需要主网进行确认。 - -## 《链管理》要做什么 - -《链管理》模块用来管理加入NULS主网的链的基本信息，包括： - -* 注册一条新的友链 -* 销毁已经存在的友链 -* 查询友链信息 -* 特定友链增加资产类型 -* 特定友链销毁资产类型 -* 跨链资产校验 - -## 《链管理》在系统中的定位 - -《链管理》强依赖的模块： - -- 核心模块 -- 网络模块 -- 交易管理模块 -- 账本模块 - -《链管理》弱依赖的模块： - -- 事件总线模块 - - diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/config/NulsChainConfig.java b/module/nuls-chain-manager/src/main/java/io/nuls/chain/config/NulsChainConfig.java deleted file mode 100644 index 8b2e10580c..0000000000 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/config/NulsChainConfig.java +++ /dev/null @@ -1,280 +0,0 @@ -package io.nuls.chain.config; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; - -import java.math.BigInteger; - -/** - * @author lanjinsheng - */ -@Component -@Configuration(domain = ModuleE.Constant.CHAIN_MANAGER) -public class NulsChainConfig implements ModuleConfig { - - private String logLevel = "DEBUG"; - private String language; - private String encoding = "UTF-8"; - /** - * ROCK DB 数据库文件存储路径 - */ - private String dataPath; - /** - * 初始配置参数 - */ - private String chainNameMax; - private String assetSymbolMax; - private String assetNameMax; - private BigInteger assetDepositNuls; - private BigInteger assetDestroyNuls; - private String assetDepositNulsDestroyRate; - private String assetDepositNulsLockRate; - - private String assetInitNumberMin; - private String assetInitNumberMax; - private String assetDecimalPlacesMin; - private String assetDecimalPlacesMax; - private String assetRecoveryRate; - - private String mainChainId; - private String chainName; - private String mainAssetId; - private String nulsAssetInitNumberMax; - private String mainSymbol; - private String addressPrefix; - private String nulsFeeMainNetRate = "0.6"; - private int nulsFeeMainNetPercent = 60; - private int nulsFeeOtherNetPercent = 40; - private String blackHolePublicKey; - private String defaultDecimalPlaces = "8"; - - private int chainAssetsTaskIntervalMinute; - - public int getChainAssetsTaskIntervalMinute() { - return chainAssetsTaskIntervalMinute; - } - - public void setChainAssetsTaskIntervalMinute(int chainAssetsTaskIntervalMinute) { - this.chainAssetsTaskIntervalMinute = chainAssetsTaskIntervalMinute; - } - - public String getDefaultDecimalPlaces() { - return defaultDecimalPlaces; - } - - public void setDefaultDecimalPlaces(String defaultDecimalPlaces) { - this.defaultDecimalPlaces = defaultDecimalPlaces; - } - - public String getBlackHolePublicKey() { - return blackHolePublicKey; - } - - public void setBlackHolePublicKey(String blackHolePublicKey) { - this.blackHolePublicKey = blackHolePublicKey; - } - - public int getNulsFeeMainNetPercent() { - return nulsFeeMainNetPercent; - } - - public void setNulsFeeMainNetPercent(int nulsFeeMainNetPercent) { - this.nulsFeeMainNetPercent = nulsFeeMainNetPercent; - } - - public int getNulsFeeOtherNetPercent() { - return nulsFeeOtherNetPercent; - } - - public void setNulsFeeOtherNetPercent(int nulsFeeOtherNetPercent) { - this.nulsFeeOtherNetPercent = nulsFeeOtherNetPercent; - } - - - public String getNulsFeeMainNetRate() { - return nulsFeeMainNetRate; - } - - public void setNulsFeeMainNetRate(String nulsFeeMainNetRate) { - this.nulsFeeMainNetRate = nulsFeeMainNetRate; - } - - public String getLogLevel() { - return logLevel; - } - - public void setLogLevel(String logLevel) { - this.logLevel = logLevel; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getAssetSymbolMax() { - return assetSymbolMax; - } - - public void setAssetSymbolMax(String assetSymbolMax) { - this.assetSymbolMax = assetSymbolMax; - } - - public String getAssetNameMax() { - return assetNameMax; - } - - public void setAssetNameMax(String assetNameMax) { - this.assetNameMax = assetNameMax; - } - - public BigInteger getAssetDepositNuls() { - return assetDepositNuls; - } - - public void setAssetDepositNuls(BigInteger assetDepositNuls) { - this.assetDepositNuls = assetDepositNuls; - } - - public BigInteger getAssetDestroyNuls() { - return assetDestroyNuls; - } - - public void setAssetDestroyNuls(BigInteger assetDestroyNuls) { - this.assetDestroyNuls = assetDestroyNuls; - } - - public String getAssetDepositNulsDestroyRate() { - return assetDepositNulsDestroyRate; - } - - public void setAssetDepositNulsDestroyRate(String assetDepositNulsDestroyRate) { - this.assetDepositNulsDestroyRate = assetDepositNulsDestroyRate; - } - - public String getAddressPrefix() { - return addressPrefix; - } - - public void setAddressPrefix(String addressPrefix) { - this.addressPrefix = addressPrefix; - } - - public String getAssetDepositNulsLockRate() { - return assetDepositNulsLockRate; - } - - public void setAssetDepositNulsLockRate(String assetDepositNulsLockRate) { - this.assetDepositNulsLockRate = assetDepositNulsLockRate; - } - - public String getAssetInitNumberMin() { - return assetInitNumberMin; - } - - public void setAssetInitNumberMin(String assetInitNumberMin) { - this.assetInitNumberMin = assetInitNumberMin; - } - - public String getAssetInitNumberMax() { - return assetInitNumberMax; - } - - public void setAssetInitNumberMax(String assetInitNumberMax) { - this.assetInitNumberMax = assetInitNumberMax; - } - - public String getAssetDecimalPlacesMin() { - return assetDecimalPlacesMin; - } - - public void setAssetDecimalPlacesMin(String assetDecimalPlacesMin) { - this.assetDecimalPlacesMin = assetDecimalPlacesMin; - } - - public String getAssetDecimalPlacesMax() { - return assetDecimalPlacesMax; - } - - public void setAssetDecimalPlacesMax(String assetDecimalPlacesMax) { - this.assetDecimalPlacesMax = assetDecimalPlacesMax; - } - - public String getAssetRecoveryRate() { - return assetRecoveryRate; - } - - public void setAssetRecoveryRate(String assetRecoveryRate) { - this.assetRecoveryRate = assetRecoveryRate; - } - - public String getMainChainId() { - return mainChainId; - } - - public void setMainChainId(String mainChainId) { - this.mainChainId = mainChainId; - } - - public String getChainName() { - return chainName; - } - - public void setChainName(String chainName) { - this.chainName = chainName; - } - - public String getMainAssetId() { - return mainAssetId; - } - - public void setMainAssetId(String mainAssetId) { - this.mainAssetId = mainAssetId; - } - - public String getNulsAssetInitNumberMax() { - return nulsAssetInitNumberMax; - } - - public void setNulsAssetInitNumberMax(String nulsAssetInitNumberMax) { - this.nulsAssetInitNumberMax = nulsAssetInitNumberMax; - } - - public String getMainSymbol() { - return mainSymbol; - } - - public void setMainSymbol(String mainSymbol) { - this.mainSymbol = mainSymbol; - } - - public String getChainNameMax() { - return chainNameMax; - } - - public void setChainNameMax(String chainNameMax) { - this.chainNameMax = chainNameMax; - } - -} diff --git a/module/nuls-chain-manager/src/main/resources/languages/en.properties b/module/nuls-chain-manager/src/main/resources/languages/en.properties deleted file mode 100644 index d6e6968bc5..0000000000 --- a/module/nuls-chain-manager/src/main/resources/languages/en.properties +++ /dev/null @@ -1,42 +0,0 @@ -cm_0001=Balance not enough -cm_0002=Param tx error -cm_0003=Not cross transaction -cm_0004=Parameter error -cm_1001=Chain ID already exist -cm_1002=Chain name length error -cm_1003=Chain not found -cm_1004=Chain address error -cm_1005=Chain status is incorrect -cm_1006=Chain Asset is more than 1 -cm_1007=Chain magic number already exist -cm_1008=Chain name already exist -cm_1009=Chain verifier list is empty -cm_1010=Signature bft ration error -cm_1011=Max signature count error -cm_1012=Chain address prefix error -cm_1013=Chain Once used,but disable now. you can use updatecrosschain cmd to update. -cm_1014=Chain in active. -cm_1015=ChainId=1 or chainId=2 is system chain. - - -cm_2000=Asset Symbol error -cm_2001=Asset Symbol length error -cm_2002=Asset Symbol already exist -cm_2003=JSON cannot be transfer to Asset object -cm_2004=The assets recovered must exceed 0.9 -cm_2005=Asset ID already exist -cm_2006=Asset name error -cm_2007=Asset name length error -cm_2008=The deposit nuls must be 200000 -cm_2009=Asset init number error -cm_2011=Asset decimal places error -cm_2013=The chain used to calculate is not a chain for registering the asset -cm_2014=Asset not exist -cm_2015=Asset number exceed initialization quantity -cm_2016=Asset Address Error -cm_2017=txHash Error -cm_2018=transaction register rpc call error -cm_2019=ledger balance rpc call error -cm_2020=Asset had already disable -cm_3000=Account validation error -cm_3001=Account signDigest error. \ No newline at end of file diff --git a/module/nuls-chain-manager/src/main/resources/module.json b/module/nuls-chain-manager/src/main/resources/module.json deleted file mode 100644 index 44e563e623..0000000000 --- a/module/nuls-chain-manager/src/main/resources/module.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "language": "en", - "encoding": "UTF-8", - "defaultDecimalPlaces": "8", - "chainNameMax": "20", - "assetSymbolMax": "8", - "assetNameMax": "20", - "assetDepositNuls": 1000, - "assetDepositNulsDestroyRate": "0.2", - "assetInitNumberMin": "100000000", - "assetInitNumberMax": "10000000000000", - "assetDecimalPlacesMin": "0", - "assetDecimalPlacesMax": "18", - "assetRecoveryRate": "0.9", - "mainChainId": "1", - "chainName": "NULS", - "mainAssetId": "1", - "nulsAssetInitNumberMax": "100000000", - "mainSymbol": "NULS", - "nulsFeeMainNetRate": "0.6", - "chainAssetsTaskIntervalMinute": 600 -} diff --git a/module/nuls-chain-manager/src/main/resources/protocol-config.json b/module/nuls-chain-manager/src/main/resources/protocol-config.json deleted file mode 100644 index dca6503477..0000000000 --- a/module/nuls-chain-manager/src/main/resources/protocol-config.json +++ /dev/null @@ -1,168 +0,0 @@ -[ - { - "version": "15", - "extend": "12", - "validTxs": [ - { - "type": "11", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "RegChainTxProcessorV15" - }, - { - "type": "13", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AddAssetTxProcessorV15" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "12", - "extend": "7", - "validTxs": [ - { - "type": "13", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AddAssetTxProcessorV12" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - - { - "version": "7", - "extend": "", - "validTxs": [ - { - "type": "11", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "RegChainTxProcessorV7" - }, - { - "type": "12", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": true, - "handler": "DestroyChainTxProcessorV7" - }, - { - "type": "13", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AddAssetTxProcessorV7" - }, - { - "type": "14", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": true, - "handler": "DisableAssetTxProcessorV7" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "5", - "extend": "", - "validTxs": [ - { - "type": "11", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "RegChainTxProcessorV5" - }, - { - "type": "12", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": true, - "handler": "DestroyChainTxProcessorV5" - }, - { - "type": "13", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AddAssetTxProcessorV5" - }, - { - "type": "14", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": true, - "handler": "DisableAssetTxProcessorV5" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "1", - "extend": "", - "validTxs": [ - { - "type": "11", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "RegChainTxProcessorV1" - }, - { - "type": "12", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": true, - "handler": "DestroyChainTxProcessorV1" - }, - { - "type": "13", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AddAssetTxProcessorV1" - }, - { - "type": "14", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": true, - "handler": "DisableAssetTxProcessorV1" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-cmd-client/module.ncf b/module/nuls-cmd-client/module.ncf index 42052c0ba6..b9a7cc11a2 100644 --- a/module/nuls-cmd-client/module.ncf +++ b/module/nuls-cmd-client/module.ncf @@ -11,5 +11,5 @@ Managed=0 loadLanguage=1 [cmd-client] -moduleDynamicDependent=cross-chain,chain-manager,smart-contract,protocol-update -clientVersion=2.4.0 +moduleDynamicDependent=nuls-cores +clientVersion=2.16.0 diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CmdClientModule.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CmdClientModule.java index 84a1e15823..1066c2509d 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CmdClientModule.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CmdClientModule.java @@ -40,12 +40,13 @@ public class CmdClientModule extends RpcModule { @Override public Module[] declareDependent() { return new Module[]{ - new Module(ModuleE.NW.abbr, ROLE), - new Module(ModuleE.AC.abbr, ROLE), - new Module(ModuleE.TX.abbr, ROLE), - new Module(ModuleE.BL.abbr, ROLE), - new Module(ModuleE.CS.abbr, ROLE), - new Module(ModuleE.LG.abbr, ROLE) + //new Module(ModuleE.NW.abbr, ROLE), + //new Module(ModuleE.AC.abbr, ROLE), + //new Module(ModuleE.TX.abbr, ROLE), + //new Module(ModuleE.BL.abbr, ROLE), + //new Module(ModuleE.CS.abbr, ROLE), + //new Module(ModuleE.LG.abbr, ROLE) + new Module(ModuleE.NC.abbr, ROLE) }; } diff --git a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/GetTxProcessor.java b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/GetTxProcessor.java index b35023969d..17d6241b49 100644 --- a/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/GetTxProcessor.java +++ b/module/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/transaction/GetTxProcessor.java @@ -10,7 +10,7 @@ * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in all + * The above copyright Bnotice and this permission notice shall be included in all * copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR diff --git a/module/nuls-consensus/economic-model/base-economic/pom.xml b/module/nuls-consensus/economic-model/base-economic/pom.xml deleted file mode 100644 index 07e0fe0588..0000000000 --- a/module/nuls-consensus/economic-model/base-economic/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - economic-model - io.nuls.v2 - 1.0.0-SNAPSHOT - - 4.0.0 - base-economic - base-economic - - - base-economic - - diff --git a/module/nuls-consensus/economic-model/base-economic/src/test/java/io/nuls/provider/AppTest.java b/module/nuls-consensus/economic-model/base-economic/src/test/java/io/nuls/provider/AppTest.java deleted file mode 100644 index bd49f2c722..0000000000 --- a/module/nuls-consensus/economic-model/base-economic/src/test/java/io/nuls/provider/AppTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.nuls.provider; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -} diff --git a/module/nuls-consensus/economic-model/nuls-economic/pom.xml b/module/nuls-consensus/economic-model/nuls-economic/pom.xml deleted file mode 100644 index de41af2901..0000000000 --- a/module/nuls-consensus/economic-model/nuls-economic/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - economic-model - io.nuls.v2 - 1.0.0-SNAPSHOT - - 4.0.0 - nuls-economic - nuls-economic - - - - io.nuls.v2 - base-economic - ${project.version} - - - - - nuls-economic - - diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/test/java/io/nuls/provider/AppTest.java b/module/nuls-consensus/economic-model/nuls-economic/src/test/java/io/nuls/provider/AppTest.java deleted file mode 100644 index bd49f2c722..0000000000 --- a/module/nuls-consensus/economic-model/nuls-economic/src/test/java/io/nuls/provider/AppTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.nuls.provider; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -} diff --git a/module/nuls-consensus/economic-model/pom.xml b/module/nuls-consensus/economic-model/pom.xml deleted file mode 100644 index 1c9588c841..0000000000 --- a/module/nuls-consensus/economic-model/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - nuls-consensus - io.nuls.v2 - 1.0.0-SNAPSHOT - - 4.0.0 - economic-model - pom - economic-model - - - base-economic - nuls-economic - - - diff --git a/module/nuls-consensus/nuls-consensus-poc/module.ncf b/module/nuls-consensus/nuls-consensus-poc/module.ncf deleted file mode 100644 index b2ff53fc67..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/module.ncf +++ /dev/null @@ -1,13 +0,0 @@ -[JAVA] -APP_NAME=consensus -MAIN_CLASS=io.nuls.poc.ConsensusBootStrap -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=512 - -[Core] -Managed=1 - -[consensus] -moduleDynamicDependent=protocol-update,smart-contract - diff --git a/module/nuls-consensus/nuls-consensus-poc/pom.xml b/module/nuls-consensus/nuls-consensus-poc/pom.xml deleted file mode 100644 index be30908ccb..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - 4.0.0 - - io.nuls.v2 - nuls-consensus - 1.0.0-SNAPSHOT - - nuls-consensus-poc - nuls-poc-consensus - - - io.nuls.v2 - nuls-base-protocol-update - - - io.nuls.v2 - nuls-economic - ${project.version} - - - - nuls-consensus-poc - - diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java deleted file mode 100644 index efde0d5dfc..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java +++ /dev/null @@ -1,198 +0,0 @@ -package io.nuls.poc; - -import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.base.protocol.RegisterHelper; -import io.nuls.core.core.annotation.Autowired; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.log.Log; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; -import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConfig; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.enumeration.ConsensusStatus; -import io.nuls.poc.utils.manager.ChainManager; - -import java.lang.reflect.Field; -import java.nio.charset.Charset; -import java.util.List; -import java.util.Set; - -import static java.nio.charset.StandardCharsets.UTF_8; - -/** - * 共识模块启动及初始化管理 - * Consensus Module Startup and Initialization Management - * - * @author tag - * 2018/3/4 - */ -@Component -public class ConsensusBootStrap extends RpcModule { - - @Autowired - private ConsensusConfig consensusConfig; - @Autowired - private ChainManager chainManager; - @Autowired - private AddressPrefixDatas addressPrefixDatas; - - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run(ConsensusConstant.BOOT_PATH, args); - } - - /** - * 初始化模块，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 - * 在onStart前会调用此方法 - */ - @Override - public void init() { - try { - initSys(); - AddressTool.init(addressPrefixDatas); - initDB(); - chainManager.initChain(); - ModuleHelper.init(this); - } catch (Exception e) { - Log.error(e); - } - } - - @Override - public Module[] declareDependent() { - return new Module[]{ - Module.build(ModuleE.BL), - Module.build(ModuleE.AC), - Module.build(ModuleE.NW), - Module.build(ModuleE.LG), - Module.build(ModuleE.TX) - }; - } - - /** - * 指定RpcCmd的包名 - * 可以不实现此方法，若不实现将使用spring init扫描的包 - * - * @return - */ - @Override - public Set getRpcCmdPackage() { - return Set.of(ConsensusConstant.RPC_PATH); - } - - @Override - public Module moduleInfo() { - return new Module(ModuleE.CS.abbr, ConsensusConstant.RPC_VERSION); - } - - @Override - public boolean doStart() { - try { - while (!isDependencieReady(ModuleE.TX.abbr) || !isDependencieReady(ModuleE.BL.abbr)) { - Log.debug("wait depend modules ready"); - Thread.sleep(2000L); - } - chainManager.runChain(); - return true; - } catch (Exception e) { - Log.error(e); - return false; - } - } - - @Override - public void onDependenciesReady(Module module) { - try { - //共识交易注册 - if (module.getName().equals(ModuleE.TX.abbr)) { - chainManager.registerTx(); - } - //智能合约交易注册 - if (module.getName().equals(ModuleE.SC.abbr)) { - chainManager.registerContractTx(); - for (Chain chain : chainManager.getChainMap().values()) { - CallMethodUtils.sendState(chain, chain.isPacker()); - } - } - //协议注册 - if (module.getName().equals(ModuleE.PU.abbr)) { - chainManager.getChainMap().keySet().forEach(RegisterHelper::registerProtocol); - } - } catch (Exception e) { - Log.error(e); - } - } - - @Override - public RpcModuleState onDependenciesReady() { - for (Chain chain : chainManager.getChainMap().values()) { - chain.setConsensusStatus(ConsensusStatus.RUNNING); - } - Log.debug("cs onDependenciesReady"); - NulsDateUtils.getInstance().start(); - return RpcModuleState.Running; - } - - @Override - public RpcModuleState onDependenciesLoss(Module dependenciesModule) { - if (dependenciesModule.getName().equals(ModuleE.TX.abbr) || dependenciesModule.getName().equals(ModuleE.BL.abbr)) { - for (Chain chain : chainManager.getChainMap().values()) { - chain.setConsensusStatus(ConsensusStatus.WAIT_RUNNING); - } - } - return RpcModuleState.Ready; - } - - /** - * 初始化系统编码 - * Initialization System Coding - */ - private void initSys() throws Exception { - System.setProperty(ConsensusConstant.SYS_FILE_ENCODING, UTF_8.name()); - Field charset = Charset.class.getDeclaredField("defaultCharset"); - charset.setAccessible(true); - charset.set(null, UTF_8); - } - - /** - * 初始化数据库 - * Initialization database - */ - private void initDB() throws Exception { - RocksDBService.init(consensusConfig.getDataFolder()); - RocksDBService.createTable(ConsensusConstant.DB_NAME_CONSUME_CONGIF); - if (consensusConfig.getMainChainId() != 1) { - return; - } - -// List list2 = RocksDBService.valueList("consensus_agent1"); -// for (byte[] arr : list2) { -// AgentPo po = new AgentPo(); -// po.parse(arr, 0); -// boolean up = false; -// if (po.getHash().toHex().equals("44fd2f9ab6d0833024a4f77d601ff34c19b7a01490dcf01659034f7013c980f1") && po.getDelHeight() < 7865610L) { -// po.setDelHeight(30L); -// up = true; -// } -// if (up) { -// byte[] key = po.getHash().getBytes(); -// byte[] value = po.serialize(); -// RocksDBService.put("consensus_agent1", key, value); -// } -// } - - } -} \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConfig.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConfig.java deleted file mode 100644 index 0f0c7f9529..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConfig.java +++ /dev/null @@ -1,110 +0,0 @@ -package io.nuls.poc.constant; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.basic.VersionChangeInvoker; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.poc.model.bo.config.ConfigBean; - -import java.io.File; -import java.lang.reflect.InvocationTargetException; - -/** - * 共识模块配置类 - * @author tag - * @date 2019-03-26 - * */ -@Component -@Configuration(domain = ModuleE.Constant.CONSENSUS) -public class ConsensusConfig extends ConfigBean implements ModuleConfig { - - private String dataPath; - - /** 模块code*/ - private String moduleCode; - - /** 主链链ID*/ - private int mainChainId; - - /** 主链主资产ID*/ - private int mainAssetId; - - /** 语言*/ - private String language; - - /** 编码*/ - private String encoding; - - /** - * 跨链交易手续费主链收取手续费比例 - * Cross-Chain Transaction Fee Proportion of Main Chain Fee Collection - * */ - private int mainChainCommissionRatio; - - - public String getDataFolder() { - return dataPath + File.separator + ModuleE.CS.name; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getModuleCode() { - return moduleCode; - } - - public void setModuleCode(String moduleCode) { - this.moduleCode = moduleCode; - } - - public int getMainChainId() { - return mainChainId; - } - - public void setMainChainId(int mainChainId) { - this.mainChainId = mainChainId; - } - - public int getMainAssetId() { - return mainAssetId; - } - - public void setMainAssetId(int mainAssetId) { - this.mainAssetId = mainAssetId; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public int getMainChainCommissionRatio() { - return mainChainCommissionRatio; - } - - public void setMainChainCommissionRatio(int mainChainCommissionRatio) { - this.mainChainCommissionRatio = mainChainCommissionRatio; - } - @Override - public VersionChangeInvoker getVersionChangeInvoker() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - Class aClass = Class.forName("io.nuls.poc.tx.ProtocolUpgradeInvoker"); - return (VersionChangeInvoker) aClass.getDeclaredConstructor().newInstance(); - } -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigBean.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigBean.java deleted file mode 100644 index ba7d1f8298..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigBean.java +++ /dev/null @@ -1,433 +0,0 @@ -package io.nuls.poc.model.bo.config; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.base.basic.NulsOutputStreamBuffer; -import io.nuls.base.data.BaseNulsData; -import io.nuls.core.exception.NulsException; -import io.nuls.core.parse.SerializeUtils; - -import java.io.IOException; -import java.math.BigInteger; - -/** - * 共识模块配置类 - * Consensus Module Configuration Class - * - * @author tag - * 2018/11/7 - */ -public class ConfigBean extends BaseNulsData { - /** - * 本链资产ID - * assets id - */ - private int assetId; - - /** - * 本链链ID - * chain id - */ - private int chainId; - - /** - * 打包间隔时间 - * Packing interval time - */ - private long packingInterval; - /** - * 获得红牌保证金锁定时间 - * Lock-in time to get a red card margin - */ - private long redPublishLockTime; - /** - * 注销节点保证金锁定时间 - * Log-off node margin locking time - */ - private long stopAgentLockTime; - /** - * 佣金比例的最小值 - * Minimum commission ratio - */ - private byte commissionRateMin; - /** - * 佣金比例的最大值 - * Maximum commission ratio - */ - private byte commissionRateMax; - /** - * 创建节点的保证金最小值 - * Minimum margin for creating nodes - */ - private BigInteger depositMin; - /** - * 创建节点的保证金最大值 - * Maximum margin for creating nodes - */ - private BigInteger depositMax; - /** - * 节点出块委托金额最小值 - * Minimum Delegation Amount of Node Block - */ - private BigInteger commissionMin; - /** - * 节点委托金额最大值 - * Maximum Node Delegation Amount - */ - private BigInteger commissionMax; - - /** - * 委托最小金额 - * Minimum amount entrusted - */ - private BigInteger entrusterDepositMin; - - /** - * 种子节点 - * Seed node - */ - private String seedNodes; - - /** - * 出块节点密码 - * */ - private String password; - - /** - * 打包区块最大值 - * */ - private long blockMaxSize; - - /** - * 打包一个区块获得的共识奖励 - * 每年通胀/每年出块数 - * */ - private BigInteger blockReward; - - - /** - * 创建节点资产ID - * agent assets id - */ - private int agentAssetId; - - /** - * 创建节点资产链ID - * Create node asset chain ID - */ - private int agentChainId; - - - /** - * 共识奖励资产ID - * Award asset chain ID - */ - private int awardAssetId; - - /** - * 交易手续费单价 - * Transaction fee unit price - */ - private long feeUnit; - - /** - * 总通缩量 - * Total inflation amount - */ - private BigInteger totalInflationAmount; - - /** - * 初始通胀金额 - * Initial Inflation Amount - */ - private BigInteger inflationAmount; - - /** - * 通胀开始时间 - * */ - private long initTime; - - /** - * 通缩比例 - * */ - private double deflationRatio; - - /** - * 通缩间隔时间 - * */ - private long deflationTimeInterval; - - - public long getPackingInterval() { - return packingInterval; - } - - public void setPackingInterval(long packingInterval) { - this.packingInterval = packingInterval; - } - - - public long getRedPublishLockTime() { - return redPublishLockTime; - } - - public void setRedPublishLockTime(long redPublishLockTime) { - this.redPublishLockTime = redPublishLockTime; - } - - public long getStopAgentLockTime() { - return stopAgentLockTime; - } - - public void setStopAgentLockTime(long stopAgentLockTime) { - this.stopAgentLockTime = stopAgentLockTime; - } - - public byte getCommissionRateMin() { - return commissionRateMin; - } - - public void setCommissionRateMin(byte commissionRateMin) { - this.commissionRateMin = commissionRateMin; - } - - public byte getCommissionRateMax() { - return commissionRateMax; - } - - public void setCommissionRateMax(byte commissionRateMax) { - this.commissionRateMax = commissionRateMax; - } - - public BigInteger getDepositMin() { - return depositMin; - } - - public void setDepositMin(BigInteger depositMin) { - this.depositMin = depositMin; - } - - public BigInteger getDepositMax() { - return depositMax; - } - - public void setDepositMax(BigInteger depositMax) { - this.depositMax = depositMax; - } - - public BigInteger getCommissionMin() { - return commissionMin; - } - - public void setCommissionMin(BigInteger commissionMin) { - this.commissionMin = commissionMin; - } - - public BigInteger getCommissionMax() { - return commissionMax; - } - - public void setCommissionMax(BigInteger commissionMax) { - this.commissionMax = commissionMax; - } - - public BigInteger getEntrusterDepositMin() { - return entrusterDepositMin; - } - - public void setEntrusterDepositMin(BigInteger entrusterDepositMin) { - this.entrusterDepositMin = entrusterDepositMin; - } - - public String getSeedNodes() { - return seedNodes; - } - - public void setSeedNodes(String seedNodes) { - this.seedNodes = seedNodes; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public BigInteger getInflationAmount() { - return inflationAmount; - } - - public void setInflationAmount(BigInteger inflationAmount) { - this.inflationAmount = inflationAmount; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public long getBlockMaxSize() { - return blockMaxSize; - } - - public void setBlockMaxSize(long blockMaxSize) { - this.blockMaxSize = blockMaxSize; - } - - public BigInteger getBlockReward() { - return blockReward; - } - - public void setBlockReward(BigInteger blockReward) { - this.blockReward = blockReward; - } - - public int getAgentAssetId() { - return agentAssetId; - } - - public void setAgentAssetId(int agentAssetId) { - this.agentAssetId = agentAssetId; - } - - public int getAgentChainId() { - return agentChainId; - } - - public void setAgentChainId(int agentChainId) { - this.agentChainId = agentChainId; - } - - public int getAwardAssetId() { - return awardAssetId; - } - - public void setAwardAssetId(int awardAssetId) { - this.awardAssetId = awardAssetId; - } - - public long getFeeUnit() { - return feeUnit; - } - - public void setFeeUnit(long feeUnit) { - this.feeUnit = feeUnit; - } - - public long getInitTime() { - return initTime; - } - - public void setInitTime(long initTime) { - this.initTime = initTime; - } - - public double getDeflationRatio() { - return deflationRatio; - } - - public void setDeflationRatio(double deflationRatio) { - this.deflationRatio = deflationRatio; - } - - public long getDeflationTimeInterval() { - return deflationTimeInterval; - } - - public void setDeflationTimeInterval(long deflationTimeInterval) { - this.deflationTimeInterval = deflationTimeInterval; - } - - public BigInteger getTotalInflationAmount() { - return totalInflationAmount; - } - - public void setTotalInflationAmount(BigInteger totalInflationAmount) { - this.totalInflationAmount = totalInflationAmount; - } - - @Override - protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { - stream.writeUint32(packingInterval); - stream.writeUint32(redPublishLockTime); - stream.writeUint32(stopAgentLockTime); - stream.writeByte(commissionRateMin); - stream.writeByte(commissionRateMax); - stream.writeBigInteger(depositMin); - stream.writeBigInteger(depositMax); - stream.writeBigInteger(commissionMin); - stream.writeBigInteger(commissionMax); - stream.writeBigInteger(entrusterDepositMin); - stream.writeString(seedNodes); - stream.writeUint16(assetId); - stream.writeUint16(chainId); - stream.writeString(password); - stream.writeUint48(blockMaxSize); - stream.writeBigInteger(blockReward); - stream.writeUint16(agentAssetId); - stream.writeUint16(agentChainId); - stream.writeUint16(awardAssetId); - stream.writeUint32(feeUnit); - stream.writeBigInteger(totalInflationAmount); - stream.writeBigInteger(inflationAmount); - stream.writeUint32(initTime); - stream.writeDouble(deflationRatio); - stream.writeUint32(deflationTimeInterval); - } - - @Override - public void parse(NulsByteBuffer byteBuffer) throws NulsException { - this.packingInterval = byteBuffer.readUint32(); - this.redPublishLockTime = byteBuffer.readUint32(); - this.stopAgentLockTime = byteBuffer.readUint32(); - this.commissionRateMin = byteBuffer.readByte(); - this.commissionRateMax = byteBuffer.readByte(); - this.depositMin = byteBuffer.readBigInteger(); - this.depositMax = byteBuffer.readBigInteger(); - this.commissionMin = byteBuffer.readBigInteger(); - this.commissionMax = byteBuffer.readBigInteger(); - this.entrusterDepositMin = byteBuffer.readBigInteger(); - this.seedNodes = byteBuffer.readString(); - this.assetId = byteBuffer.readUint16(); - this.chainId = byteBuffer.readUint16(); - this.password = byteBuffer.readString(); - this.blockMaxSize = byteBuffer.readUint48(); - this.blockReward = byteBuffer.readBigInteger(); - this.agentAssetId = byteBuffer.readUint16(); - this.agentChainId = byteBuffer.readUint16(); - this.awardAssetId = byteBuffer.readUint16(); - this.feeUnit = byteBuffer.readUint32(); - this.totalInflationAmount = byteBuffer.readBigInteger(); - this.inflationAmount = byteBuffer.readBigInteger(); - this.initTime = byteBuffer.readUint32(); - this.deflationRatio = byteBuffer.readDouble(); - this.deflationTimeInterval = byteBuffer.readUint32(); - } - - @Override - public int size() { - int size = 0; - size += SerializeUtils.sizeOfUint48(); - size += SerializeUtils.sizeOfUint32() * 5; - size += 2; - size += SerializeUtils.sizeOfDouble(deflationRatio); - size += SerializeUtils.sizeOfBigInteger() * 8; - size += SerializeUtils.sizeOfString(seedNodes); - size += SerializeUtils.sizeOfUint16() * 5; - size += SerializeUtils.sizeOfString(password); - size += SerializeUtils.sizeOfUint32(); - return size; - } -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigItem.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigItem.java deleted file mode 100644 index 557290442a..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/config/ConfigItem.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.nuls.poc.model.bo.config; - -/** - * 配置信息类 - * Configuration information class - * - * @author tag - * 2018/11/8 - * */ -public class ConfigItem { - private String key; - private Object value; - private boolean readOnly; - - public ConfigItem(){ - - } - public ConfigItem( Object value, boolean readOnly) { - this.value = value; - this.readOnly = readOnly; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public boolean isReadOnly() { - return readOnly; - } - - public void setReadOnly(boolean readOnly) { - this.readOnly = readOnly; - } -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/ConfigService.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/ConfigService.java deleted file mode 100644 index 37d8ff4340..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/ConfigService.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.nuls.poc.storage; - -import io.nuls.poc.model.bo.config.ConfigBean; - -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author tag - * 2018/11/8 - * */ -public interface ConfigService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param bean 配置类/config bean - * @param chainID 链ID/chain id - * @return 保存是否成功/Is preservation successful? - * @exception - * */ - boolean save(ConfigBean bean,int chainID)throws Exception; - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainID 链ID/chain id - * @return 配置信息类/config bean - * */ - ConfigBean get(int chainID); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainID 链ID/chain id - * @return 删除是否成功/Delete success - * */ - boolean delete(int chainID); - - /** - * 获取当前节点所有的链信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - * */ - Map getList(); -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/ConfigServiceImpl.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/ConfigServiceImpl.java deleted file mode 100644 index faa7d150f2..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/ConfigServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package io.nuls.poc.storage.impl; - -import io.nuls.core.core.annotation.Component; -import io.nuls.core.rockdb.model.Entry; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.storage.ConfigService; -import io.nuls.core.core.annotation.Service; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.model.ObjectUtils; -import io.nuls.core.log.Log; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author tag - * 2018/11/8 - * */ -@Component -public class ConfigServiceImpl implements ConfigService { - @Override - public boolean save(ConfigBean bean, int chainID) throws Exception{ - if(bean == null){ - return false; - } - return RocksDBService.put(ConsensusConstant.DB_NAME_CONSUME_CONGIF, ByteUtils.intToBytes(chainID), bean.serialize()); - } - - @Override - public ConfigBean get(int chainID) { - try { - byte[] value = RocksDBService.get(ConsensusConstant.DB_NAME_CONSUME_CONGIF,ByteUtils.intToBytes(chainID)); - ConfigBean configBean = new ConfigBean(); - configBean.parse(value,0); - return configBean; - }catch (Exception e){ - Log.error(e); - return null; - } - } - - @Override - public boolean delete(int chainID) { - try { - return RocksDBService.delete(ConsensusConstant.DB_NAME_CONSUME_CONGIF,ByteUtils.intToBytes(chainID)); - }catch (Exception e){ - Log.error(e); - return false; - } - } - - @Override - public Map getList() { - try { - List> list = RocksDBService.entryList(ConsensusConstant.DB_NAME_CONSUME_CONGIF); - Map configBeanMap = new HashMap<>(ConsensusConstant.INIT_CAPACITY); - for (Entryentry:list) { - int key = ByteUtils.bytesToInt(entry.getKey()); - ConfigBean configBean = new ConfigBean(); - configBean.parse(entry.getValue(),0); - configBeanMap.put(key,configBean); - } - return configBeanMap; - }catch (Exception e){ - Log.error(e); - return null; - } - } - - /*@Override - public void afterPropertiesSet() throws NulsException { - try { - RocksDBService.createTable(ConsensusConstant.DB_NAME_CONSUME_CONGIF); - }catch (Exception e){ - Log.error(e); - throw new NulsException(e); - } - }*/ -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/ProtocolUpgradeInvoker.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/ProtocolUpgradeInvoker.java deleted file mode 100644 index a3846d3bde..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/ProtocolUpgradeInvoker.java +++ /dev/null @@ -1,32 +0,0 @@ -package io.nuls.poc.tx; -import io.nuls.core.basic.VersionChangeInvoker; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.log.Log; -import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.storage.ConfigService; -import io.nuls.poc.utils.manager.ChainManager; - -/** - * @author: tag - * @date: 2019/09/12 - */ -public class ProtocolUpgradeInvoker implements VersionChangeInvoker { - - @Override - public void process(int chainId) { - ChainManager chainManager = SpringLiteContext.getBean(ChainManager.class); - Chain chain = chainManager.getChainMap().get(chainId); - if (chain == null) { - Log.error(ConsensusErrorCode.CHAIN_NOT_EXIST.getMsg()); - } - try { - long time = NulsDateUtils.getCurrentTimeSeconds(); - chain.getLogger().info("协议升级完成,升级时间：{}",time); - }catch (Exception e){ - chain.getLogger().error("协议升级失败"); - chain.getLogger().error(e); - } - } -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConfigManager.java b/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConfigManager.java deleted file mode 100644 index e8eacb2195..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConfigManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.nuls.poc.utils.manager; - -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.bo.config.ConfigItem; -import io.nuls.poc.storage.ConfigService; -import io.nuls.core.core.ioc.SpringLiteContext; - -import java.lang.reflect.Field; -import java.math.BigInteger; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 共识模块配置文件管理类 - * Consensus Module Profile Management Class - * - * @author tag - * 2018/11/20 - * */ -public class ConfigManager { - /** - * 配置参数是否可修改 - * param_name - 是否可修改标识 - * */ - public static Map param_modify = new HashMap<>(); - - /** - * 初始化配置信息 - * Initialize configuration information - * - * @param items 配置参数列表 - * */ - public static ConfigBean initManager(List items) throws Exception{ - ConfigBean bean = new ConfigBean(); - Class beanClass = bean.getClass(); - Field field; - /* - 通过反射设置bean属性值 - Setting bean attribute values by reflection - */ - for (ConfigItem item : items) { - param_modify.put(item.getKey(),item.isReadOnly()); - field = beanClass.getDeclaredField(item.getKey()); - field.setAccessible(true); - if("java.math.BigInteger".equals(field.getType().getName())){ - field.set(bean, new BigInteger((String) item.getValue())); - }else{ - field.set(bean,item.getValue()); - } - } - /* - 保存配置信息到数据库 - Save configuration information to database - */ - ConfigService configService = SpringLiteContext.getBean(ConfigService.class); - boolean saveSuccess = configService.save(bean,bean.getChainId()); - if(saveSuccess){ - return bean; - } - return null; - } -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/resources/languages/en.properties b/module/nuls-consensus/nuls-consensus-poc/src/main/resources/languages/en.properties deleted file mode 100644 index f486e8d885..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/resources/languages/en.properties +++ /dev/null @@ -1,44 +0,0 @@ -cs_0001=data error -cs_0002=tx not exist -cs_0003=agent do not exist -cs_0004=data do not exist -cs_0005=address is error -cs_0006=param is error -cs_0007=The packaging address cannot be the same as the agent address -cs_0008=The packaging address and reward addresses cannot be the same -cs_0009=Commission is out of range -cs_0010=Margin out of range -cs_0011=Token amount error -cs_0012=Transaction data validation error -cs_0013=Agent exist -cs_0014=Agent packing Address has been used -cs_0015=Credit ratio too low -cs_0016=Repeated transaction -cs_0017=Exceeding the maximum amount that can be entrusted -cs_0018=Less than the minimum guaranteed amount -cs_0019=Data Added Failure -cs_0020=Data rollback failure -cs_0021=Merkelgen Validation Error -cs_0022=Block Round data Validation Failed -cs_0023=Insufficient balance -cs_0024=Chains do not exist -cs_0025=Block red and yellow trades failed to verify -cs_0026=Block signature error -cs_0027=Red card transaction verification error -cs_0028=CoinBase transaction validation error -cs_0029=Verify that the transaction list is empty -cs_0030=Remote method call failed -cs_0031=Account Validation Error -cs_0032=Transaction Signature Verification Error -cs_0033=CoinData valid error -cs_0034=The entrusted transaction has withdrawn from the entrustment -cs_0035=The rollback withdrawal delegation transaction was not submitted -cs_0036=Try fork -cs_0037=Double speed -cs_0038=Get too many yellow cards -cs_0039=Conflict detection error -cs_0040=Insufficient handling fees -cs_0041=Error unlocking time -cs_0042=Transaction creator not signed -cs_0043=Agent creator not signed -cs_0044=Unsettled transaction must be initiated by the principal \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/resources/module.json b/module/nuls-consensus/nuls-consensus-poc/src/main/resources/module.json deleted file mode 100644 index 859c0c034c..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/resources/module.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "packingInterval": 10, - "inflationAmount": 18000000000, - "redPublishLockTime": 5184000, - "stopAgentLockTime": 259200, - "commissionRateMin": 10, - "commissionRateMax": 100, - "depositMin": 2000000000000, - "depositMax": 20000000000000, - "commissionMin": 20000000000000, - "commissionMax": 50000000000000, - "entrusterDepositMin": 200000000000, - "blockReward": 0, - "blockMaxSize": 4900000, - "moduleCode": "cs", - "maxAgentCountOfAddress": "1", - "mainChainCommissionRatio": 60 -} diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/resources/protocol-config.json b/module/nuls-consensus/nuls-consensus-poc/src/main/resources/protocol-config.json deleted file mode 100644 index 4afd410f49..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/resources/protocol-config.json +++ /dev/null @@ -1,254 +0,0 @@ -[ - { - "version": "13", - "extend": "4", - "validTxs": [ - { - "type": "34", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "DelayStopAgentProcessorV1" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "4", - "extend": "3", - "validTxs": [ - { - "type": "4", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "CreateAgentProcessorV4" - }, - { - "type": "5", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "DepositProcessorV4" - }, - { - "type": "6", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "WithdrawProcessorV4" - }, - { - "type": "8", - "systemTx": true, - "unlockTx": true, - "verifySignature": false, - "verifyFee": false, - "handler": "RedPunishProcessorV4" - }, - { - "type": "9", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "StopAgentProcessorV4" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - },{ - "version": "3", - "extend": "2", - "validTxs": [ - { - "type": "4", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "CreateAgentProcessorV3" - }, - { - "type": "5", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "DepositProcessorV3" - }, - { - "type": "6", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "WithdrawProcessorV3" - }, - { - "type": "9", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "StopAgentProcessorV3" - }, - { - "type": "21", - "systemTx": true, - "unlockTx": false, - "verifySignature": false, - "handler": "ContractDepositProcessorV3" - }, - { - "type": "23", - "systemTx": true, - "unlockTx": true, - "verifySignature": false, - "handler": "ContractStopAgentProcessorV2" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "2", - "extend": "1", - "validTxs": [ - { - "type": "5", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "DepositProcessorV2" - }, - { - "type": "21", - "systemTx": true, - "unlockTx": false, - "verifySignature": false, - "handler": "ContractDepositProcessorV2" - }, - { - "type": "9", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "StopAgentProcessorV2" - }, - { - "type": "23", - "systemTx": true, - "unlockTx": true, - "verifySignature": false, - "handler": "ContractStopAgentProcessorV2" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "1", - "extend": "", - "validTxs": [ - { - "type": "1", - "systemTx": true, - "unlockTx": false, - "verifySignature": false, - "verifyFee": false, - "handler": "CoinBaseProcessorV1" - }, - { - "type": "4", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "CreateAgentProcessorV1" - }, - { - "type": "5", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": false, - "handler": "DepositProcessorV1" - }, - { - "type": "6", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "WithdrawProcessorV1" - }, - { - "type": "7", - "systemTx": true, - "unlockTx": false, - "verifySignature": false, - "verifyFee": false, - "handler": "YellowPunishProcessorV1" - }, - { - "type": "8", - "systemTx": true, - "unlockTx": true, - "verifySignature": false, - "verifyFee": false, - "handler": "RedPunishProcessorV1" - }, - { - "type": "9", - "systemTx": false, - "unlockTx": true, - "verifySignature": true, - "verifyFee": false, - "handler": "StopAgentProcessorV1" - }, - { - "type": "20", - "systemTx": true, - "unlockTx": false, - "verifySignature": false, - "handler": "ContractCreateAgentProcessorV1" - }, - { - "type": "21", - "systemTx": true, - "unlockTx": false, - "verifySignature": false, - "handler": "ContractDepositProcessorV1" - }, - { - "type": "22", - "systemTx": true, - "unlockTx": true, - "verifySignature": false, - "handler": "ContractWithdrawProcessorV1" - }, - { - "type": "23", - "systemTx": true, - "unlockTx": true, - "verifySignature": false, - "handler": "ContractStopAgentProcessorV1" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/ConfigStorageTest.java b/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/ConfigStorageTest.java deleted file mode 100644 index bcb7efdf28..0000000000 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/ConfigStorageTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.nuls.test.storage; - -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.storage.ConfigService; -import io.nuls.test.TestUtil; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.log.Log; -import io.nuls.core.parse.ConfigLoader; -import org.junit.Before; -import org.junit.Test; - -import java.util.Map; -import java.util.Properties; - -import static org.junit.Assert.assertNotNull; - -public class ConfigStorageTest { - private ConfigService configService; - @Before - public void init(){ - try { - Properties properties = ConfigLoader.loadProperties(ConsensusConstant.DB_CONFIG_NAME); - String path = properties.getProperty(ConsensusConstant.DB_DATA_PATH, ConsensusConstant.DB_DATA_DEFAULT_PATH); - RocksDBService.init(path); - TestUtil.initTable(1); - }catch (Exception e){ - Log.error(e); - } - SpringLiteContext.init(ConsensusConstant.CONTEXT_PATH); - configService = SpringLiteContext.getBean(ConfigService.class); - } - - @Test - public void saveConfig()throws Exception{ - ConfigBean configBean = new ConfigBean(); - configBean.setAssetId(1); - //configBean.setChainId(1); - configBean.setChainId(2); - configBean.setBlockMaxSize(5242880); - configBean.setPackingInterval(10); - System.out.println(configService.save(configBean,1)); - getConfig(); - getConfigList(); - } - - @Test - public void getConfig(){ - ConfigBean configBean = configService.get(1); - assertNotNull(configBean); - System.out.println(configBean.getChainId()); - } - - @Test - public void deleteConfig(){ - System.out.println(configService.delete(1)); - getConfig(); - } - - @Test - public void getConfigList(){ - Map configBeanMap=configService.getList(); - assertNotNull(configBeanMap); - System.out.println(configBeanMap.size()); - } -} diff --git a/module/nuls-consensus/pom.xml b/module/nuls-consensus/pom.xml deleted file mode 100644 index b7f825bb1b..0000000000 --- a/module/nuls-consensus/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-consensus - pom - nuls-consensus - - nuls-consensus-poc - economic-model - - - diff --git a/module/nuls-consensus/readme.md b/module/nuls-consensus/readme.md deleted file mode 100644 index e98ed9f41a..0000000000 --- a/module/nuls-consensus/readme.md +++ /dev/null @@ -1,29 +0,0 @@ -# 模块概述 - -## 为什么要有共识模块 - - 众所周知，区块链的核心是共识机制。和传统互联网的cliet-server架构不同，区块链的节点是对等的，没有中心，大家权利一样；所以为了使数据达到一致性，让一个没有中心的网络维护一套大家都认同的账本，这就是共识机制的作用。 - - 从广义上来说，共识机制就是区块链每个节点共同遵守的规则或算法，是实现互信的基础，如此才能实现去中心化的无监管，维持整个平台的正常运转。 - - 从狭义来说，共识机制决定了每个节点对区块链上交易的验证和确认的机制。 - -## 共识模块要做什么 - - 区块链的每次交易，都必须获得每个节点的认可，只有全网都达成共识后，交易才算完成。就好像民主选举中，投票方式或规则必须被全民认可，基于此才能完成选举。而在区块链中，共识机制的主要表现就是激励制度，也就是给矿工的奖励。在共识机制的保障下，每个矿工都能获得奖励，整个区块链才能有序的运转，提供公平、透明及互信的环境。因此共识模块就需要提供特定的算法来维持，即共识算法。 - - 公链共识机制有多种，主流的有POW、POS、DPOS。NULS主网采用自主原创的POC（Proof Of Credit）共识机制，一种继承了Dpos共识机制的安全性和高效率，同时在协作方面进行了非常大的改进，可以看成是一种升级版的Dpos。 - - POC共识模块职责： - -- 区块同步后的合法性验证 -- 创建共识节点、委托参与共识、取消委托、注销共识节点★ -- 共识节点打包出块 -- 网络维护激励的发放 -- 作恶节点惩罚★ - PS：不同的共识机制其共识算法不尽相同，以上有标记★的为POC共识特有 - -## 《共识模块》在系统中的定位 - - 共识模块在系统中是比较核心的一块，主要负责打包交易出块，验证区块头，管理系统中的共识节点信息，委托信息，处罚信息等。 - diff --git a/module/nuls-account/documents/Module documentation is all here.txt b/module/nuls-cores/documents/account/Module documentation is all here.txt similarity index 100% rename from module/nuls-account/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/account/Module documentation is all here.txt diff --git a/module/nuls-account/documents/account.md b/module/nuls-cores/documents/account/account.md similarity index 100% rename from module/nuls-account/documents/account.md rename to module/nuls-cores/documents/account/account.md diff --git a/module/nuls-account/documents/account_design.md b/module/nuls-cores/documents/account/account_design.md similarity index 100% rename from module/nuls-account/documents/account_design.md rename to module/nuls-cores/documents/account/account_design.md diff --git a/module/nuls-account/documents/img/account-context.png b/module/nuls-cores/documents/account/img/account-context.png similarity index 100% rename from module/nuls-account/documents/img/account-context.png rename to module/nuls-cores/documents/account/img/account-context.png diff --git a/module/nuls-account/documents/img/account-functions.png b/module/nuls-cores/documents/account/img/account-functions.png similarity index 100% rename from module/nuls-account/documents/img/account-functions.png rename to module/nuls-cores/documents/account/img/account-functions.png diff --git a/module/nuls-account/documents/img/account-module.png b/module/nuls-cores/documents/account/img/account-module.png similarity index 100% rename from module/nuls-account/documents/img/account-module.png rename to module/nuls-cores/documents/account/img/account-module.png diff --git a/module/nuls-account/readme.md b/module/nuls-cores/documents/account/readme.md similarity index 100% rename from module/nuls-account/readme.md rename to module/nuls-cores/documents/account/readme.md diff --git a/module/nuls-block/documents/Module documentation is all here.txt b/module/nuls-cores/documents/block/Module documentation is all here.txt similarity index 100% rename from module/nuls-block/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/block/Module documentation is all here.txt diff --git a/module/nuls-block/documents/block.md b/module/nuls-cores/documents/block/block.md similarity index 100% rename from module/nuls-block/documents/block.md rename to module/nuls-cores/documents/block/block.md diff --git a/module/nuls-block/readme.md b/module/nuls-cores/documents/block/readme.md similarity index 100% rename from module/nuls-block/readme.md rename to module/nuls-cores/documents/block/readme.md diff --git a/module/nuls-chain-manager/documents/Module documentation is all here.txt b/module/nuls-cores/documents/chain/Module documentation is all here.txt similarity index 100% rename from module/nuls-chain-manager/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/chain/Module documentation is all here.txt diff --git a/module/nuls-chain-manager/documents/chain-manager.md b/module/nuls-cores/documents/chain/chain-manager.md similarity index 100% rename from module/nuls-chain-manager/documents/chain-manager.md rename to module/nuls-cores/documents/chain/chain-manager.md diff --git a/module/nuls-consensus/documents/Module documentation is all here.txt b/module/nuls-cores/documents/consensus/Module documentation is all here.txt similarity index 100% rename from module/nuls-consensus/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/consensus/Module documentation is all here.txt diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/consensus.md b/module/nuls-cores/documents/consensus/consensus.md similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/consensus.md rename to module/nuls-cores/documents/consensus/consensus.md diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/coinbase.png b/module/nuls-cores/documents/consensus/image/consensus-module/coinbase.png similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/coinbase.png rename to module/nuls-cores/documents/consensus/image/consensus-module/coinbase.png diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-constants.jpg b/module/nuls-cores/documents/consensus/image/consensus-module/consensus-constants.jpg similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-constants.jpg rename to module/nuls-cores/documents/consensus/image/consensus-module/consensus-constants.jpg diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-flow-5.png b/module/nuls-cores/documents/consensus/image/consensus-module/consensus-flow-5.png similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-flow-5.png rename to module/nuls-cores/documents/consensus/image/consensus-module/consensus-flow-5.png diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-func.png b/module/nuls-cores/documents/consensus/image/consensus-module/consensus-func.png similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-func.png rename to module/nuls-cores/documents/consensus/image/consensus-module/consensus-func.png diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-staticsReward.jpg b/module/nuls-cores/documents/consensus/image/consensus-module/consensus-staticsReward.jpg similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/consensus-staticsReward.jpg rename to module/nuls-cores/documents/consensus/image/consensus-module/consensus-staticsReward.jpg diff --git a/module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/statics_en.png b/module/nuls-cores/documents/consensus/image/consensus-module/statics_en.png similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/documents/image/consensus-module/statics_en.png rename to module/nuls-cores/documents/consensus/image/consensus-module/statics_en.png diff --git "a/module/nuls-consensus/nuls-consensus-poc/documents/n.\345\205\261\350\257\206\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" "b/module/nuls-cores/documents/consensus/n.\345\205\261\350\257\206\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" similarity index 100% rename from "module/nuls-consensus/nuls-consensus-poc/documents/n.\345\205\261\350\257\206\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" rename to "module/nuls-cores/documents/consensus/n.\345\205\261\350\257\206\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" diff --git a/module/nuls-consensus/nuls-consensus-poc/readme.md b/module/nuls-cores/documents/consensus/readme.md similarity index 100% rename from module/nuls-consensus/nuls-consensus-poc/readme.md rename to module/nuls-cores/documents/consensus/readme.md diff --git a/module/nuls-ledger/documents/Module documentation is all here.txt b/module/nuls-cores/documents/contract/Module documentation is all here.txt similarity index 100% rename from module/nuls-ledger/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/contract/Module documentation is all here.txt diff --git a/module/nuls-smart-contract/readme.md b/module/nuls-cores/documents/contract/readme.md similarity index 100% rename from module/nuls-smart-contract/readme.md rename to module/nuls-cores/documents/contract/readme.md diff --git a/module/nuls-smart-contract/documents/smart-contract.md b/module/nuls-cores/documents/contract/smart-contract.md similarity index 100% rename from module/nuls-smart-contract/documents/smart-contract.md rename to module/nuls-cores/documents/contract/smart-contract.md diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain.md b/module/nuls-cores/documents/crosschain/cross-chain.md similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain.md rename to module/nuls-cores/documents/crosschain/cross-chain.md diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/Main-Parallel-Ctx.jpg b/module/nuls-cores/documents/crosschain/cross-chain/Main-Parallel-Ctx.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/Main-Parallel-Ctx.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/Main-Parallel-Ctx.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/MainNet-VerifierChange.jpg b/module/nuls-cores/documents/crosschain/cross-chain/MainNet-VerifierChange.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/MainNet-VerifierChange.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/MainNet-VerifierChange.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/Parallel-Main-Ctx.jpg b/module/nuls-cores/documents/crosschain/cross-chain/Parallel-Main-Ctx.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/Parallel-Main-Ctx.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/Parallel-Main-Ctx.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/Parallel-Parallel-Ctx.jpg b/module/nuls-cores/documents/crosschain/cross-chain/Parallel-Parallel-Ctx.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/Parallel-Parallel-Ctx.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/Parallel-Parallel-Ctx.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/Parallel-VerifierChange.jpg b/module/nuls-cores/documents/crosschain/cross-chain/Parallel-VerifierChange.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/Parallel-VerifierChange.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/Parallel-VerifierChange.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/Verifire.jpg b/module/nuls-cores/documents/crosschain/cross-chain/Verifire.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/Verifire.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/Verifire.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/VerifireInit.jpg b/module/nuls-cores/documents/crosschain/cross-chain/VerifireInit.jpg similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/VerifireInit.jpg rename to module/nuls-cores/documents/crosschain/cross-chain/VerifireInit.jpg diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/VerifireInit.png b/module/nuls-cores/documents/crosschain/cross-chain/VerifireInit.png similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/VerifireInit.png rename to module/nuls-cores/documents/crosschain/cross-chain/VerifireInit.png diff --git a/module/nuls-cross-chain/cross-chain/documents/cross-chain/cross_chain_functions.png b/module/nuls-cores/documents/crosschain/cross-chain/cross_chain_functions.png similarity index 100% rename from module/nuls-cross-chain/cross-chain/documents/cross-chain/cross_chain_functions.png rename to module/nuls-cores/documents/crosschain/cross-chain/cross_chain_functions.png diff --git "a/module/nuls-cross-chain/cross-chain/documents/k.\350\267\250\351\223\276\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" "b/module/nuls-cores/documents/crosschain/k.\350\267\250\351\223\276\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" similarity index 100% rename from "module/nuls-cross-chain/cross-chain/documents/k.\350\267\250\351\223\276\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" rename to "module/nuls-cores/documents/crosschain/k.\350\267\250\351\223\276\346\250\241\345\235\227\350\256\276\350\256\241v1.3.md" diff --git a/module/nuls-cross-chain/cross-chain/readme.md b/module/nuls-cores/documents/crosschain/readme.md similarity index 100% rename from module/nuls-cross-chain/cross-chain/readme.md rename to module/nuls-cores/documents/crosschain/readme.md diff --git a/module/nuls-network/documents/Module documentation is all here.txt b/module/nuls-cores/documents/ledger/Module documentation is all here.txt similarity index 100% rename from module/nuls-network/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/ledger/Module documentation is all here.txt diff --git a/module/nuls-ledger/README.md b/module/nuls-cores/documents/ledger/README.md similarity index 100% rename from module/nuls-ledger/README.md rename to module/nuls-cores/documents/ledger/README.md diff --git a/module/nuls-ledger/documents/ledger.md b/module/nuls-cores/documents/ledger/ledger.md similarity index 100% rename from module/nuls-ledger/documents/ledger.md rename to module/nuls-cores/documents/ledger/ledger.md diff --git a/module/nuls-protocol-update/documents/Module documentation is all here.txt b/module/nuls-cores/documents/network/Module documentation is all here.txt similarity index 100% rename from module/nuls-protocol-update/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/network/Module documentation is all here.txt diff --git a/module/nuls-network/documents/network.md b/module/nuls-cores/documents/network/network.md similarity index 100% rename from module/nuls-network/documents/network.md rename to module/nuls-cores/documents/network/network.md diff --git a/module/nuls-network/readme.md b/module/nuls-cores/documents/network/readme.md similarity index 100% rename from module/nuls-network/readme.md rename to module/nuls-cores/documents/network/readme.md diff --git a/module/nuls-smart-contract/documents/Module documentation is all here.txt b/module/nuls-cores/documents/protocol/Module documentation is all here.txt similarity index 100% rename from module/nuls-smart-contract/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/protocol/Module documentation is all here.txt diff --git a/module/nuls-protocol-update/readme.md b/module/nuls-cores/documents/protocol/readme.md similarity index 100% rename from module/nuls-protocol-update/readme.md rename to module/nuls-cores/documents/protocol/readme.md diff --git a/module/nuls-transaction/documents/Module documentation is all here.txt b/module/nuls-cores/documents/transaction/Module documentation is all here.txt similarity index 100% rename from module/nuls-transaction/documents/Module documentation is all here.txt rename to module/nuls-cores/documents/transaction/Module documentation is all here.txt diff --git a/module/nuls-transaction/documents/img/architecture.png b/module/nuls-cores/documents/transaction/img/architecture.png similarity index 100% rename from module/nuls-transaction/documents/img/architecture.png rename to module/nuls-cores/documents/transaction/img/architecture.png diff --git a/module/nuls-transaction/documents/img/functional-architecture.png b/module/nuls-cores/documents/transaction/img/functional-architecture.png similarity index 100% rename from module/nuls-transaction/documents/img/functional-architecture.png rename to module/nuls-cores/documents/transaction/img/functional-architecture.png diff --git a/module/nuls-transaction/documents/img/new-tx.png b/module/nuls-cores/documents/transaction/img/new-tx.png similarity index 100% rename from module/nuls-transaction/documents/img/new-tx.png rename to module/nuls-cores/documents/transaction/img/new-tx.png diff --git a/module/nuls-transaction/readme.md b/module/nuls-cores/documents/transaction/readme.md similarity index 100% rename from module/nuls-transaction/readme.md rename to module/nuls-cores/documents/transaction/readme.md diff --git a/module/nuls-transaction/documents/transaction.md b/module/nuls-cores/documents/transaction/transaction.md similarity index 100% rename from module/nuls-transaction/documents/transaction.md rename to module/nuls-cores/documents/transaction/transaction.md diff --git a/module/nuls-transaction/documents/transaction_design.md b/module/nuls-cores/documents/transaction/transaction_design.md similarity index 100% rename from module/nuls-transaction/documents/transaction_design.md rename to module/nuls-cores/documents/transaction/transaction_design.md diff --git a/module/nuls-cores/module.ncf b/module/nuls-cores/module.ncf new file mode 100644 index 0000000000..aba0c4d6be --- /dev/null +++ b/module/nuls-cores/module.ncf @@ -0,0 +1,10 @@ +[JAVA] +APP_NAME=nuls-cores +MAIN_CLASS=io.nuls.NulsCoresBootstrap +VERSION=1.0.0 +JOPT_XMS=1024 +JOPT_XMX=2048 + +[Core] +Managed=1 +loadLanguage=1 diff --git a/module/nuls-smart-contract/pom.xml b/module/nuls-cores/pom.xml similarity index 65% rename from module/nuls-smart-contract/pom.xml rename to module/nuls-cores/pom.xml index b7ecbb589c..4bab24fc92 100644 --- a/module/nuls-smart-contract/pom.xml +++ b/module/nuls-cores/pom.xml @@ -2,15 +2,21 @@ - 4.0.0 - io.nuls.v2 module + io.nuls.v2 1.0.0-SNAPSHOT - nuls-smart-contract + 4.0.0 + + nuls-cores + 4.2 + UTF-8 + UTF-8 + 11 + 1.0.0-SNAPSHOT 7.1 4.2 1.0.0 @@ -24,10 +30,66 @@ + + io.nuls.sdk + sdk-all + 1.1.4.6 + test + + io.nuls.v2 nuls-base-protocol-update + 1.0.0-SNAPSHOT + + + + io.nuls.v2 + nuls-base-api-provider + 1.0.0-SNAPSHOT + + + + io.nuls.v2 + sdk4j + 1.1.7.RELEASE + test + + + org.mybatis + mybatis + + + io.nuls.v2 + nuls-core-h2 + + + + + javax.servlet + javax.servlet-api + 4.0.1 + + + + io.netty + netty-all + 4.1.72.Final + + + com.google.protobuf + protobuf-java + + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.13.3 + + io.nuls.v2 @@ -99,12 +161,6 @@ ${asm.version} - - - - - - junit junit @@ -134,6 +190,7 @@ 1.18.8 test + io.nuls.v2 sdk4j @@ -151,10 +208,20 @@ - + + com.google.code.gson + gson + 2.8.9 + test + - - nuls-smart-contract + + junit + junit + 4.13.1 + test + + + - \ No newline at end of file diff --git a/module/nuls-cores/src/main/java/io/nuls/NulsCoresBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/NulsCoresBootstrap.java new file mode 100644 index 0000000000..ec936012d3 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/NulsCoresBootstrap.java @@ -0,0 +1,286 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2019 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package io.nuls; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.nuls.account.util.LoggerUtil; +import io.nuls.base.api.provider.Provider; +import io.nuls.base.api.provider.ServiceManager; +import io.nuls.base.basic.AddressTool; +import io.nuls.base.protocol.ModuleHelper; +import io.nuls.common.*; +import io.nuls.contract.tx.SmartContractVersionChangeInvoker; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.core.config.ConfigurationLoader; +import io.nuls.core.core.ioc.SpringLiteContext; +import io.nuls.core.log.Log; +import io.nuls.core.parse.JSONUtils; +import io.nuls.core.rpc.cmd.BaseCmd; +import io.nuls.core.rpc.info.HostInfo; +import io.nuls.core.rpc.model.CmdAnnotation; +import io.nuls.core.rpc.model.InvokeBean; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.NulsCoresCmd; +import io.nuls.core.rpc.modulebootstrap.Module; +import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; +import io.nuls.core.rpc.modulebootstrap.RpcModule; +import io.nuls.core.rpc.modulebootstrap.RpcModuleState; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; +import io.nuls.core.rpc.util.AddressPrefixDatas; +import io.nuls.core.rpc.util.NulsDateUtils; +import io.nuls.transaction.constant.TxConstant; +import io.nuls.transaction.manager.ChainManager; +import io.nuls.transaction.rpc.upgrade.TxVersionChangeInvoker; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.nio.charset.Charset; +import java.util.*; + +import static io.nuls.transaction.utils.LoggerUtil.LOG; +import static java.nio.charset.StandardCharsets.UTF_8; + +/** + * @author: Charlie + * @date: 2019/3/4 + */ +@Component +public class NulsCoresBootstrap extends RpcModule { + + private static String[] args; + @Autowired + private NulsCoresConfig config; + @Autowired + private AddressPrefixDatas addressPrefixDatas; + @Autowired + private ChainManager chainManager; + @Autowired + private ConfigManager configManager; + + public static void main(String[] args) throws Exception { + initSys(); + if (args == null || args.length == 0) { + args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; + } + NulsCoresBootstrap.args = args; + NulsRpcModuleBootstrap.run("io.nuls", args); + } + + @Override + public void init() { + try { + super.init(); + CommonVersionChangeInvoker.addProcess(TxVersionChangeInvoker.instance()); + CommonVersionChangeInvoker.addProcess(SmartContractVersionChangeInvoker.instance()); + //初始化配置项 + initCfg(); + ModuleHelper.init(this); + } catch (Exception e) { + LOG.error("Transaction init error!"); + LOG.error(e); + } + } + + @Override + public boolean doStart() { + try { + configManager.init(); + NulsDateUtils.getInstance().start(); + LoggerUtil.LOG.info("Nuls-Core onDependenciesReady"); + LoggerUtil.LOG.info("START-SUCCESS"); + try { + Collection list = SpringLiteContext.getAllBeanList(); + List coreList = new ArrayList<>(); + for (Object object : list) { + if(object instanceof INulsCoresBootstrap) { + coreList.add((INulsCoresBootstrap) object); + } + } + // 按指定顺序执行异构链注册 + coreList.sort(new Comparator() { + @Override + public int compare(INulsCoresBootstrap o1, INulsCoresBootstrap o2) { + if (o1.order() > o2.order()) { + return 1; + } else if (o1.order() < o2.order()) { + return -1; + } + return 0; + } + }); + initCores(coreList); + configManager.registerProtocol(); + runCores(coreList); + } catch (Exception e) { + LOG.error(e); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + return true; + } + + + @Override + public void onDependenciesReady(Module module) { + } + + @Override + public RpcModuleState onDependenciesReady() { + LOG.info("Transaction onDependenciesReady"); + NulsDateUtils.getInstance().start(); + CommonContext.START_BOOT.countDown(); + return RpcModuleState.Running; + } + + @Override + public RpcModuleState onDependenciesLoss(Module module) { + return RpcModuleState.Ready; + } + + @Override + protected long getTryRuningTimeout() { + return 60000; + } + + @Override + public Module[] declareDependent() { + return new Module[]{ + Module.build(ModuleE.NC) + }; + } + + @Override + public Module moduleInfo() { + return new Module(ModuleE.NC.abbr, "1.0"); + } + + + private void initCfg() { + try { + Provider.ProviderType providerType = Provider.ProviderType.RPC; + ServiceManager.init(config.getChainId(), providerType); + /** + * 地址工具初始化 + */ + AddressTool.init(addressPrefixDatas); + AddressTool.addPrefix(config.getChainId(), config.getAddressPrefix()); + + // 核心模块cmd集合 + List cmdList = SpringLiteContext.getBeanList(BaseCmd.class); + for (BaseCmd cmd : cmdList) { + Class clazs = cmd.getClass(); + NulsCoresCmd nulsCoresCmd = clazs.getAnnotation(NulsCoresCmd.class); + if (nulsCoresCmd == null) { + continue; + } + ModuleE module = nulsCoresCmd.module(); + String moduleAbbr = module.abbr; + Method[] methods = clazs.getMethods(); + for (Method method : methods) { + CmdAnnotation annotation = method.getAnnotation(CmdAnnotation.class); + if (annotation == null) { + continue; + } + String cmdName = annotation.cmd(); + //System.out.println(String.format( + // "moduleName: %s, cmd: %s, class instance: %s, method: %s", + // moduleAbbr, cmdName, cmd.getClass().getName(), method.getName() + //)); + ResponseMessageProcessor.INVOKE_BEAN_MAP.put(moduleAbbr + "_" + cmdName, new InvokeBean(cmd, method)); + } + } + // 配置合并模块前，每个模块下的交易 + Object[][] txTypeModules = new Object[][] { + new Object[]{ModuleE.AC.abbr, new int[]{2, 3, 63, 64, 65}}, + new Object[]{ModuleE.BL.abbr, new int[]{}}, + new Object[]{ModuleE.CS.abbr, new int[]{1, 4, 5, 6, 7, 8, 9, 20, 21, 22, 23, 34}}, + new Object[]{ModuleE.CM.abbr, new int[]{11, 12, 13, 14}}, + new Object[]{ModuleE.CC.abbr, new int[]{10, 24, 25, 26, 60, 61}}, + new Object[]{ModuleE.LG.abbr, new int[]{27}}, + new Object[]{ModuleE.NW.abbr, new int[]{}}, + new Object[]{ModuleE.PU.abbr, new int[]{}}, + new Object[]{ModuleE.SC.abbr, new int[]{15, 16, 17, 18, 19}}, + new Object[]{ModuleE.TX.abbr, new int[]{}} + }; + for (Object[] txTypeModule : txTypeModules) { + String moduleAbbr = (String) txTypeModule[0]; + int[] txTypes = (int[]) txTypeModule[1]; + if (txTypes.length == 0) { + continue; + } + for (int txType : txTypes) { + ResponseMessageProcessor.TX_TYPE_MODULE_MAP.put(txType, moduleAbbr); + } + } + + } catch (Exception e) { + LoggerUtil.LOG.error("NulsCores Bootstrap initCfg failed :{}", e.getMessage(), e); + throw new RuntimeException("NulsCores Bootstrap initCfg failed"); + } + } + + /** + * 初始化系统编码 + */ + private static void initSys() throws Exception { + try { + Class.forName("io.nuls.core.rpc.netty.processor.ResponseMessageProcessor"); + ConfigurationLoader configurationLoader = new ConfigurationLoader(); + configurationLoader.load(); + int defaultChainId = Integer.parseInt(configurationLoader.getValue("chainId")); + ServiceManager.init(defaultChainId, Provider.ProviderType.RPC); + System.setProperty(TxConstant.SYS_ALLOW_NULL_ARRAY_ELEMENT, "true"); + System.setProperty(TxConstant.SYS_FILE_ENCODING, UTF_8.name()); + Field charset = Charset.class.getDeclaredField("defaultCharset"); + charset.setAccessible(true); + charset.set(null, UTF_8); + ObjectMapper objectMapper = JSONUtils.getInstance(); + objectMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + } catch (Exception e) { + Log.error(e); + throw e; + } + } + + private void initCores(List coreList) { + for (INulsCoresBootstrap core : coreList) { + LOG.info("Nerve core module [{}] init", core.moduleInfo().getName()); + core.mainFunction(args); + } + } + + private void runCores(List coreList) { + for (INulsCoresBootstrap core : coreList) { + LOG.info("Nerve core module ready [{}]", core.moduleInfo().getName()); + core.onDependenciesReady(); + } + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/account/AccountBootstrap.java similarity index 56% rename from module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java rename to module/nuls-cores/src/main/java/io/nuls/account/AccountBootstrap.java index 673b1a120c..be6f16ebf1 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/AccountBootstrap.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/AccountBootstrap.java @@ -1,15 +1,13 @@ package io.nuls.account; -import io.nuls.account.config.AccountConfig; import io.nuls.account.config.NulsConfig; import io.nuls.account.constant.AccountErrorCode; import io.nuls.account.constant.AccountStorageConstant; import io.nuls.account.util.LoggerUtil; import io.nuls.account.util.manager.ChainManager; import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.RegisterHelper; +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; @@ -17,14 +15,9 @@ import io.nuls.core.model.StringUtils; import io.nuls.core.rockdb.constant.DBErrorCode; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; import java.io.File; @@ -33,36 +26,19 @@ * @date: 2018/10/15 */ @Component -public class AccountBootstrap extends RpcModule { +public class AccountBootstrap implements INulsCoresBootstrap { @Autowired - private AccountConfig accountConfig; + private NulsCoresConfig accountConfig; @Autowired private ChainManager chainManager; @Autowired private AddressPrefixDatas addressPrefixDatas; - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); - } - - /** - * 返回此模块的依赖模块 - * 可写作 return new Module[]{new Module(ModuleE.LG.abbr, "1.0"),new Module(ModuleE.TX.abbr, "1.0")} - * - * @return - */ @Override - public Module[] declareDependent() { - return new Module[]{ - new Module(ModuleE.NW.abbr, ROLE), - new Module(ModuleE.TX.abbr, ROLE), - new Module(ModuleE.LG.abbr, ROLE) - }; + public int order() { + return 6; } /** @@ -75,82 +51,32 @@ public Module moduleInfo() { return new Module(ModuleE.AC.abbr, "1.0"); } + @Override + public void mainFunction(String[] args) { + init(); + } /** * 初始化模块信息，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 */ - @Override public void init() { try { - super.init(); //初始化配置项 initCfg(); //初始化数据库 initDB(); chainManager.initChain(); - ModuleHelper.init(this); } catch (Exception e) { LoggerUtil.LOG.error("AccountBootsrap init error!"); throw new RuntimeException(e); } } - /** - * 已完成spring init注入，开始启动模块 - * - * @return 如果启动完成返回true，模块将进入ready状态，若启动失败返回false，10秒后会再次调用此方法 - */ - @Override - public boolean doStart() { -// Map lan = I18nUtils.getAll(); -// lan.entrySet().forEach(entry->{ -// entry.getValue().forEach((key,value)->{ -// Log.info("{}:{}",key,value); -// }); -// }); - return true; - } @Override - public void onDependenciesReady(Module module) { - if (ModuleE.TX.abbr.equals(module.getName())) { - //注册账户模块相关交易 - chainManager.registerTx(); - LoggerUtil.LOG.info("register tx ..."); - } - if (ModuleE.NW.abbr.equals(module.getName())) { - RegisterHelper.registerMsg(ProtocolGroupManager.getOneProtocol()); - LoggerUtil.LOG.info("register msg ..."); - } - if (ModuleE.PU.abbr.equals(module.getName())) { - //注册账户模块相关交易 - chainManager.getChainMap().keySet().forEach(RegisterHelper::registerProtocol); - LoggerUtil.LOG.info("register protocol ..."); - } - } - - /** - * 所有外部依赖进入ready状态后会调用此方法，正常启动后返回Running状态 - * - * @return - */ - @Override - public RpcModuleState onDependenciesReady() { - NulsDateUtils.getInstance().start(); + public void onDependenciesReady() { LoggerUtil.LOG.info("account onDependenciesReady"); LoggerUtil.LOG.info("START-SUCCESS"); - return RpcModuleState.Running; - } - - /** - * 某个外部依赖连接丢失后，会调用此方法，可控制模块状态，如果返回Ready,则表明模块退化到Ready状态，当依赖重新准备完毕后，将重新触发onDependenciesReady方法，若返回的状态是Running，将不会重新触发onDependenciesReady - * - * @param module - * @return - */ - @Override - public RpcModuleState onDependenciesLoss(Module module) { - return RpcModuleState.Ready; } public void initCfg() { @@ -188,9 +114,6 @@ private void initDB() throws Exception { if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_ACCOUNT)) { RocksDBService.createTable(AccountStorageConstant.DB_NAME_ACCOUNT); } - if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_ACCOUNT_CONGIF)) { - RocksDBService.createTable(AccountStorageConstant.DB_NAME_ACCOUNT_CONGIF); - } if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_MULTI_SIG_ACCOUNT)) { RocksDBService.createTable(AccountStorageConstant.DB_NAME_MULTI_SIG_ACCOUNT); } diff --git a/module/nuls-account/src/main/java/io/nuls/account/config/NulsConfig.java b/module/nuls-cores/src/main/java/io/nuls/account/config/NulsConfig.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/config/NulsConfig.java rename to module/nuls-cores/src/main/java/io/nuls/account/config/NulsConfig.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/constant/AccountConstant.java b/module/nuls-cores/src/main/java/io/nuls/account/constant/AccountConstant.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/constant/AccountConstant.java rename to module/nuls-cores/src/main/java/io/nuls/account/constant/AccountConstant.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/constant/AccountErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/account/constant/AccountErrorCode.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/constant/AccountErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/account/constant/AccountErrorCode.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/constant/AccountStorageConstant.java b/module/nuls-cores/src/main/java/io/nuls/account/constant/AccountStorageConstant.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/constant/AccountStorageConstant.java rename to module/nuls-cores/src/main/java/io/nuls/account/constant/AccountStorageConstant.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/constant/RpcConstant.java b/module/nuls-cores/src/main/java/io/nuls/account/constant/RpcConstant.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/constant/RpcConstant.java rename to module/nuls-cores/src/main/java/io/nuls/account/constant/RpcConstant.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/constant/RpcParameterNameConstant.java b/module/nuls-cores/src/main/java/io/nuls/account/constant/RpcParameterNameConstant.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/constant/RpcParameterNameConstant.java rename to module/nuls-cores/src/main/java/io/nuls/account/constant/RpcParameterNameConstant.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java b/module/nuls-cores/src/main/java/io/nuls/account/helper/AccountBlockHelper.java similarity index 98% rename from module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java rename to module/nuls-cores/src/main/java/io/nuls/account/helper/AccountBlockHelper.java index 9cbb66de63..d10b3dc589 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/helper/AccountBlockHelper.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/helper/AccountBlockHelper.java @@ -23,7 +23,6 @@ */ package io.nuls.account.helper; -import io.nuls.account.config.AccountConfig; import io.nuls.account.config.NulsConfig; import io.nuls.account.constant.AccountErrorCode; import io.nuls.account.model.bo.Chain; @@ -36,6 +35,7 @@ import io.nuls.base.data.CoinFrom; import io.nuls.base.data.CoinTo; import io.nuls.base.data.Transaction; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -53,7 +53,7 @@ public class AccountBlockHelper { @Autowired - private AccountConfig accountConfig; + private NulsCoresConfig accountConfig; public Result blockAccountTxValidate(Chain chain, Transaction tx) throws NulsException { diff --git a/module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java b/module/nuls-cores/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java similarity index 98% rename from module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java rename to module/nuls-cores/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java index 30c32d0f24..0eebbb646f 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/helper/AccountContractCallHelper.java @@ -23,7 +23,6 @@ */ package io.nuls.account.helper; -import io.nuls.account.config.AccountConfig; import io.nuls.account.config.NulsConfig; import io.nuls.account.constant.AccountErrorCode; import io.nuls.account.model.bo.Chain; @@ -34,6 +33,7 @@ import io.nuls.base.data.CoinFrom; import io.nuls.base.data.CoinTo; import io.nuls.base.data.Transaction; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -51,7 +51,7 @@ public class AccountContractCallHelper { @Autowired - private AccountConfig accountConfig; + private NulsCoresConfig accountConfig; public Result validate(Chain chain, Transaction tx) throws NulsException { diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/NonceBalance.java b/module/nuls-cores/src/main/java/io/nuls/account/model/NonceBalance.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/NonceBalance.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/NonceBalance.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/Account.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/Account.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/Account.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/Account.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/AccountKeyStore.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/AccountKeyStore.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/AccountKeyStore.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/AccountKeyStore.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/AccountStatus.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/AccountStatus.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/AccountStatus.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/AccountStatus.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/Chain.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/Chain.java similarity index 96% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/Chain.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/Chain.java index f9ebcfa792..75aff1cce2 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/model/bo/Chain.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/Chain.java @@ -1,6 +1,6 @@ package io.nuls.account.model.bo; -import io.nuls.account.model.bo.config.ConfigBean; +import io.nuls.common.ConfigBean; import io.nuls.core.log.logback.NulsLogger; import java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/VerifyTxResult.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/VerifyTxResult.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/VerifyTxResult.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/VerifyTxResult.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/AccountBlockExtend.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/AccountBlockInfo.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AliasTransaction.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/AliasTransaction.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/AliasTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/AliasTransaction.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountBlockData.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/txdata/AccountContractCallData.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/Alias.java b/module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/txdata/Alias.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/tx/txdata/Alias.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/bo/tx/txdata/Alias.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountBlockDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountKeyStoreDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountKeyStoreDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountKeyStoreDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountKeyStoreDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountOfflineDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountOfflineDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/AccountOfflineDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/AccountOfflineDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/BaseCoinDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/BaseCoinDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/BaseCoinDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/BaseCoinDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/CoinDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/CoinDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/CoinDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/CoinDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignCoinFromDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignCoinFromDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignCoinFromDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignCoinFromDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignCoinToDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignCoinToDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignCoinToDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignCoinToDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignTransactionResultDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignTransactionResultDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignTransactionResultDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignTransactionResultDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignTransferDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignTransferDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/MultiSignTransferDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/MultiSignTransferDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/SimpleAccountDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/SimpleAccountDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/SimpleAccountDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/SimpleAccountDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/dto/TransferDTO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/dto/TransferDTO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/dto/TransferDTO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/dto/TransferDTO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountBlockExtendPO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockPO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountBlockPO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/po/AccountBlockPO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountBlockPO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountContractCallPO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AccountPO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountPO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/po/AccountPO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/po/AccountPO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/AliasPO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/po/AliasPO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/po/AliasPO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/po/AliasPO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/po/MultiSigAccountPO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/po/MultiSigAccountPO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/po/MultiSigAccountPO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/po/MultiSigAccountPO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java b/module/nuls-cores/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java rename to module/nuls-cores/src/main/java/io/nuls/account/model/vo/AccountBlockVO.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/call/EventCall.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/call/EventCall.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/call/EventCall.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/call/EventCall.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/call/LedgerCall.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/call/LedgerCall.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/call/LedgerCall.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/call/LedgerCall.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/call/TransactionCall.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/call/TransactionCall.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/call/TransactionCall.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/call/TransactionCall.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java similarity index 99% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java index 15fbc3ac87..4160f32cc2 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AccountBlockCmd.java @@ -31,6 +31,7 @@ * @date: 2022/1/18 */ @Component +@NulsCoresCmd(module = ModuleE.AC) public class AccountBlockCmd extends BaseCmd { @Autowired diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java similarity index 99% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java index 016f9aef58..b50c8f1aa1 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AccountCmd.java @@ -54,6 +54,7 @@ * @date: 2018/11/5 */ @Component +@NulsCoresCmd(module = ModuleE.AC) public class AccountCmd extends BaseCmd { @Autowired diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/TransactionCmd.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AcmTransactionCmd.java similarity index 99% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/TransactionCmd.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AcmTransactionCmd.java index 8277826351..90708b3339 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/TransactionCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AcmTransactionCmd.java @@ -39,7 +39,8 @@ * @date: 2018/11/5 */ @Component -public class TransactionCmd extends BaseCmd { +@NulsCoresCmd(module = ModuleE.AC) +public class AcmTransactionCmd extends BaseCmd { @Autowired private TransactionService transactionService; diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java similarity index 99% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java index 77edd8e9ff..d1b0a237b3 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AddressPrefixCmd.java @@ -23,6 +23,7 @@ * @date: 2018/11/5 */ @Component +@NulsCoresCmd(module = ModuleE.AC) public class AddressPrefixCmd extends BaseCmd { @CmdAnnotation(cmd = "ac_getAllAddressPrefix", version = 1.0, description = "获取所有链的地址前缀") diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java similarity index 99% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java index a5eb035d4b..3af55ce1e7 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/AliasCmd.java @@ -27,6 +27,7 @@ * @date: Nov.20th 2018 */ @Component +@NulsCoresCmd(module = ModuleE.AC) public class AliasCmd extends BaseCmd { @Autowired diff --git a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java similarity index 99% rename from module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java rename to module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java index aa8b4402bd..0bb59ed5d1 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/rpc/cmd/MultiSignAccountCmd.java @@ -37,6 +37,7 @@ * @date: Dec.20th 2018 */ @Component +@NulsCoresCmd(module = ModuleE.AC) public class MultiSignAccountCmd extends BaseCmd { @Autowired private MultiSignAccountService multiSignAccountService; diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/AccountCacheService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/AccountCacheService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/AccountCacheService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/AccountCacheService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/AccountKeyStoreService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/AccountKeyStoreService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/AccountKeyStoreService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/AccountKeyStoreService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/AccountService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/AccountService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/AccountService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/AccountService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/AliasService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/AliasService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/AliasService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/AliasService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/ChainService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/ChainService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/ChainService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/ChainService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/MultiSignAccountService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/MultiSignAccountService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/MultiSignAccountService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/MultiSignAccountService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/TransactionService.java b/module/nuls-cores/src/main/java/io/nuls/account/service/TransactionService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/TransactionService.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/TransactionService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountKeyStoreServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/AccountKeyStoreServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountKeyStoreServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/impl/AccountKeyStoreServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java similarity index 98% rename from module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java index 61198ff1f1..e957993dac 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/AccountServiceImpl.java @@ -32,7 +32,6 @@ import io.nuls.account.model.bo.AccountKeyStore; import io.nuls.account.model.bo.Chain; import io.nuls.account.model.po.AccountPO; -import io.nuls.account.rpc.call.ContractCall; import io.nuls.account.rpc.call.EventCall; import io.nuls.account.service.AccountCacheService; import io.nuls.account.service.AccountKeyStoreService; @@ -58,7 +57,6 @@ import io.nuls.core.exception.CryptoException; import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; -import io.nuls.core.log.Log; import io.nuls.core.model.FormatValidUtils; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; @@ -602,9 +600,6 @@ public Account importAccountByPrikey(Chain chain, String prikey, String password accountCacheService.getLocalAccountMaps().put(account.getAddress().getBase58(), account); //backup account to keystore keyStoreService.backupAccountToKeyStore(null, chainId, account.getAddress().getBase58(), password); - if (!ContractCall.invokeAccountContract(chain, account.getAddress().getBase58())) { - chain.getLogger().warn("importAccountByPrikey invokeAccountContract failed. -address:{}", account.getAddress().getBase58()); - } return account; } @@ -702,9 +697,6 @@ public Account importAccountByKeyStore(AccountKeyStore keyStore, Chain chain, St //backup account to keystore keyStoreService.backupAccountToKeyStore(null, chainId, account.getAddress().getBase58(), password); - if (!ContractCall.invokeAccountContract(chain, account.getAddress().getBase58())) { - chain.getLogger().warn("importAccountByPrikey invokeAccountContract failed. -address:{}", account.getAddress().getBase58()); - } return account; } diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/ChainServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/ChainServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/impl/ChainServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/impl/ChainServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/MultiSigAccountServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/MultiSigAccountServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/impl/MultiSigAccountServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/impl/MultiSigAccountServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/AccountBlockStorageService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/AccountForTransferOnContractCallStorageService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/AccountStorageService.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/AccountStorageService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/AccountStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/AccountStorageService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/AliasStorageService.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/AliasStorageService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/AliasStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/AliasStorageService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/MultiSigAccountStorageService.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/MultiSigAccountStorageService.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/MultiSigAccountStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/MultiSigAccountStorageService.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AccountBlockStorageServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AccountForTransferOnContractCallStorageServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AccountStorageServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/impl/AccountStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AccountStorageServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java similarity index 95% rename from module/nuls-account/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java index f699e53f91..7fc9dc7476 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/storage/impl/AliasStorageServiceImpl.java @@ -32,12 +32,18 @@ import io.nuls.account.storage.AliasStorageService; import io.nuls.account.util.LoggerUtil; import io.nuls.base.basic.AddressTool; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.InitializingBean; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.model.StringUtils; +import io.nuls.core.rockdb.manager.RocksDBManager; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; + +import java.io.File; /** * @author EdwardChan @@ -49,6 +55,9 @@ @Component public class AliasStorageServiceImpl implements AliasStorageService, InitializingBean { + @Autowired + private NulsCoresConfig config; + /** * Initialize the storage when the application boot up */ @@ -133,6 +142,7 @@ public boolean saveAlias(int chainId, Alias alias) { String tableNameKeyIsAddress = AccountStorageConstant.DB_NAME_ACCOUNT_ALIAS_KEY_ADDRESS + chainId; boolean result = false; try { + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.AC.name); //check if the table is exist if (!RocksDBService.existTable(tableNameKeyIsAlias)) { result = RocksDBService.createTable(tableNameKeyIsAlias); diff --git a/module/nuls-account/src/main/java/io/nuls/account/storage/impl/MultiSigAccountStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/account/storage/impl/MultiSigAccountStorageServiceImpl.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/storage/impl/MultiSigAccountStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/account/storage/impl/MultiSigAccountStorageServiceImpl.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v1/AliasProcessor.java b/module/nuls-cores/src/main/java/io/nuls/account/tx/v1/AliasProcessor.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/tx/v1/AliasProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/account/tx/v1/AliasProcessor.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v1/TransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/account/tx/v1/TransferProcessor.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/tx/v1/TransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/account/tx/v1/TransferProcessor.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java b/module/nuls-cores/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java rename to module/nuls-cores/src/main/java/io/nuls/account/tx/v11/AccountLockProcessorV11.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java b/module/nuls-cores/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java rename to module/nuls-cores/src/main/java/io/nuls/account/tx/v11/AccountUnlockProcessorV11.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java b/module/nuls-cores/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java rename to module/nuls-cores/src/main/java/io/nuls/account/tx/v12/AccountLockProcessorV12.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java b/module/nuls-cores/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java rename to module/nuls-cores/src/main/java/io/nuls/account/tx/v13/AccountForTransferOnContractCallProcessorV13.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/AccountTool.java b/module/nuls-cores/src/main/java/io/nuls/account/util/AccountTool.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/util/AccountTool.java rename to module/nuls-cores/src/main/java/io/nuls/account/util/AccountTool.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/account/util/LoggerUtil.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/util/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/account/util/LoggerUtil.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/Preconditions.java b/module/nuls-cores/src/main/java/io/nuls/account/util/Preconditions.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/util/Preconditions.java rename to module/nuls-cores/src/main/java/io/nuls/account/util/Preconditions.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/TxUtil.java b/module/nuls-cores/src/main/java/io/nuls/account/util/TxUtil.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/util/TxUtil.java rename to module/nuls-cores/src/main/java/io/nuls/account/util/TxUtil.java diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/account/util/manager/ChainManager.java similarity index 73% rename from module/nuls-account/src/main/java/io/nuls/account/util/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/account/util/manager/ChainManager.java index 32cf8253ef..bd0acc7bd7 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/util/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/account/util/manager/ChainManager.java @@ -24,17 +24,14 @@ */ package io.nuls.account.util.manager; -import io.nuls.account.config.AccountConfig; import io.nuls.account.constant.AccountErrorCode; import io.nuls.account.constant.AccountStorageConstant; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.service.AccountService; -import io.nuls.account.storage.ConfigService; import io.nuls.account.util.LoggerUtil; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.ProtocolLoader; -import io.nuls.base.protocol.RegisterHelper; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.core.ioc.SpringLiteContext; @@ -56,10 +53,7 @@ public class ChainManager { @Autowired - private ConfigService configService; - - @Autowired - AccountConfig accountConfig; + NulsCoresConfig accountConfig; private Map chainMap = new ConcurrentHashMap<>(); @@ -87,7 +81,6 @@ public void initChain() throws Exception { */ initTable(chainId); chainMap.put(chainId, chain); - ProtocolLoader.load(chainId); } AccountService accountService = SpringLiteContext.getBean(AccountService.class); @@ -120,23 +113,9 @@ public void stopChain(int chainId) { */ private Map configChain() { try { - /* - 读取数据库链信息配置 - Read database chain information configuration - */ - Map configMap = configService.getList(); - /* - 如果系统是第一次运行，则本地数据库没有存储链信息，此时需要从配置文件读取主链配置信息 - If the system is running for the first time, the local database does not have chain information, - and the main chain configuration information needs to be read from the configuration file at this time. - */ - if (configMap == null || configMap.size() == 0) { - ConfigBean configBean = accountConfig.getChainConfig(); - if (configBean == null) { - return null; - } - configMap.put(configBean.getChainId(), configBean); - } + Map configMap = CommonContext.CONFIG_BEAN_MAP; + ConfigBean configBean = accountConfig; + configMap.put(configBean.getChainId(), configBean); return configMap; } catch (Exception e) { LoggerUtil.LOG.error(e); @@ -176,21 +155,6 @@ private void initLogger(Chain chain) { LoggerUtil.init(chain); } - /** - * 注册交易 - */ - public void registerTx() { - try { - for (Chain chain : chainMap.values()) { - //注册账户相关交易 - int chainId = chain.getConfig().getChainId(); - RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); - } - } catch (Exception e) { - LoggerUtil.LOG.error("registerTx error!"); - throw new RuntimeException(e); - } - } public Map getChainMap() { return chainMap; diff --git a/module/nuls-account/src/main/java/io/nuls/account/util/validator/TxValidator.java b/module/nuls-cores/src/main/java/io/nuls/account/util/validator/TxValidator.java similarity index 100% rename from module/nuls-account/src/main/java/io/nuls/account/util/validator/TxValidator.java rename to module/nuls-cores/src/main/java/io/nuls/account/util/validator/TxValidator.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/BlockBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/block/BlockBootstrap.java similarity index 62% rename from module/nuls-block/src/main/java/io/nuls/block/BlockBootstrap.java rename to module/nuls-cores/src/main/java/io/nuls/block/BlockBootstrap.java index 4acb7086e5..26b42d1989 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/BlockBootstrap.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/BlockBootstrap.java @@ -1,30 +1,22 @@ package io.nuls.block; -import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.RegisterHelper; -import io.nuls.block.constant.StatusEnum; import io.nuls.block.manager.ChainManager; import io.nuls.block.manager.ContextManager; -import io.nuls.block.model.BlockConfig; import io.nuls.block.thread.BlockSynchronizer; import io.nuls.block.thread.monitor.*; +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.core.thread.ThreadUtils; import io.nuls.core.thread.commom.NulsThreadFactory; +import java.io.File; import java.util.List; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -39,10 +31,10 @@ * @date 19-3-4 下午4:09 */ @Component -public class BlockBootstrap extends RpcModule { +public class BlockBootstrap implements INulsCoresBootstrap { @Autowired - public static BlockConfig blockConfig; + public static NulsCoresConfig blockConfig; @Autowired private AddressPrefixDatas addressPrefixDatas; @@ -51,22 +43,14 @@ public class BlockBootstrap extends RpcModule { public static boolean started = false; - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); + @Override + public int order() { + return 0; } @Override - public Module[] declareDependent() { - return new Module[]{ - Module.build(ModuleE.TX), - Module.build(ModuleE.AC), - Module.build(ModuleE.LG), - Module.build(ModuleE.CS), - Module.build(ModuleE.NW) - }; + public void mainFunction(String[] args) { + this.init(); } /** @@ -79,20 +63,10 @@ public Module moduleInfo() { } - /** - * 初始化模块信息,比如初始化RockDB等,在此处初始化后,可在其他bean的afterPropertiesSet中使用 - */ - @Override public void init() { try { - super.init(); - /** - * 地址工具初始化 - */ - AddressTool.init(addressPrefixDatas); initDb(); chainManager.initChain(); - ModuleHelper.init(this); } catch (Exception e) { Log.error("BlockBootstrap init error!"); throw new RuntimeException(e); @@ -105,23 +79,14 @@ public void init() { */ private void initDb() throws Exception { //读取配置文件,数据存储根目录,初始化打开该目录下所有表连接并放入缓存 - RocksDBService.init(blockConfig.getDataFolder()); + RocksDBService.init(blockConfig.getDataPath() + File.separator + ModuleE.BL.name); RocksDBService.createTable(CHAIN_LATEST_HEIGHT); - RocksDBService.createTable(CHAIN_PARAMETERS); RocksDBService.createTable(PROTOCOL_CONFIG); RocksDBService.createTable(ROLLBACK_HEIGHT); } - /** - * 已完成spring init注入,开始启动模块 - * @return 如果启动完成返回true, 模块将进入ready状态, 若启动失败返回false, 10秒后会再次调用此方法 - */ - @Override - public boolean doStart() { + private boolean doStart() { try { - while (!isDependencieReady(new Module(ModuleE.TX.abbr, "1.0"))) { - Thread.sleep(1000); - } //启动链 chainManager.runChain(); } catch (Exception e) { @@ -137,14 +102,13 @@ public boolean doStart() { * @return */ @Override - public RpcModuleState onDependenciesReady() { + public void onDependenciesReady() { Log.info("block onDependenciesReady"); - NulsDateUtils.getInstance().start(); + doStart(); if (started) { List chainIds = ContextManager.CHAIN_ID_LIST; for (Integer chainId : chainIds) { BlockSynchronizer.syn(chainId); -// ContextManager.getContext(chainId).setStatus(StatusEnum.RUNNING); } } else { //开启区块同步线程 @@ -175,30 +139,6 @@ public RpcModuleState onDependenciesReady() { nodesExecutor.scheduleWithFixedDelay(NodesMonitor.getInstance(), 0, blockConfig.getNodesMonitorInterval(), TimeUnit.MILLISECONDS); started = true; } - return RpcModuleState.Running; - } - - /** - * 某个外部依赖连接丢失后,会调用此方法,可控制模块状态,如果返回Ready,则表明模块退化到Ready状态,当依赖重新准备完毕后,将重新触发onDependenciesReady方法,若返回的状态是Running,将不会重新触发onDependenciesReady - * @param module - * @return - */ - @Override - public RpcModuleState onDependenciesLoss(Module module) { - List chainIds = ContextManager.CHAIN_ID_LIST; - for (Integer chainId : chainIds) { - ContextManager.getContext(chainId).setStatus(StatusEnum.INITIALIZING); - } - return RpcModuleState.Ready; } - @Override - public void onDependenciesReady(Module module) { - if (ModuleE.NW.abbr.equals(module.getName())) { - RegisterHelper.registerMsg(ProtocolGroupManager.getOneProtocol()); - } - if (ModuleE.PU.abbr.equals(module.getName())) { - ContextManager.CHAIN_ID_LIST.forEach(RegisterHelper::registerProtocol); - } - } } diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/BlockErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/BlockErrorCode.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/BlockErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/BlockErrorCode.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/BlockForwardEnum.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/BlockForwardEnum.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/BlockForwardEnum.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/BlockForwardEnum.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/ChainTypeEnum.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/ChainTypeEnum.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/ChainTypeEnum.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/ChainTypeEnum.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/CommandConstant.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/CommandConstant.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/CommandConstant.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/CommandConstant.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/Constant.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java similarity index 95% rename from module/nuls-block/src/main/java/io/nuls/block/constant/Constant.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java index 083358cdf8..695d56dea0 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/constant/Constant.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java @@ -33,11 +33,6 @@ */ public interface Constant { - /** - * 存储每条链的配置信息 - */ - String CHAIN_PARAMETERS = "chain_parameters"; - String ROLLBACK_HEIGHT = "rollback_height"; /** diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/LocalBlockStateEnum.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/LocalBlockStateEnum.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/LocalBlockStateEnum.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/LocalBlockStateEnum.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/NodeEnum.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/NodeEnum.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/NodeEnum.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/NodeEnum.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/constant/StatusEnum.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/StatusEnum.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/constant/StatusEnum.java rename to module/nuls-cores/src/main/java/io/nuls/block/constant/StatusEnum.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/manager/BlockChainManager.java b/module/nuls-cores/src/main/java/io/nuls/block/manager/BlockChainManager.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/manager/BlockChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/block/manager/BlockChainManager.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/block/manager/ChainManager.java similarity index 97% rename from module/nuls-block/src/main/java/io/nuls/block/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/block/manager/ChainManager.java index e6ca86fa3d..0648fba51f 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/manager/ChainManager.java @@ -24,7 +24,6 @@ */ package io.nuls.block.manager; -import io.nuls.base.protocol.ProtocolLoader; import io.nuls.block.rpc.call.TransactionCall; import io.nuls.block.service.BlockService; import io.nuls.block.utils.ConfigLoader; @@ -58,7 +57,6 @@ public void initChain() throws Exception { List chainIds = ContextManager.CHAIN_ID_LIST; for (Integer chainId : chainIds) { initTable(chainId); - ProtocolLoader.load(chainId); } } diff --git a/module/nuls-block/src/main/java/io/nuls/block/manager/ContextManager.java b/module/nuls-cores/src/main/java/io/nuls/block/manager/ContextManager.java similarity index 95% rename from module/nuls-block/src/main/java/io/nuls/block/manager/ContextManager.java rename to module/nuls-cores/src/main/java/io/nuls/block/manager/ContextManager.java index a68553b6f4..7ce78be797 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/manager/ContextManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/manager/ContextManager.java @@ -21,7 +21,7 @@ package io.nuls.block.manager; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import java.util.List; import java.util.Map; @@ -46,7 +46,7 @@ public class ContextManager { private ContextManager() { } - public static void init(ChainParameters chainParameters) { + public static void init(ConfigBean chainParameters) { ChainContext chainContext = new ChainContext(); int chainId = chainParameters.getChainId(); CHAIN_ID_LIST.add(chainId); diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/BlockMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/BlockMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/BlockMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/BlockMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/CompleteMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/CompleteMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/CompleteMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/CompleteMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/HashListMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/HashListMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/HashListMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/HashListMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/HashMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/HashMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/HashMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/HashMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/HeightMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/HeightMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/HeightMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/HeightMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/HeightRangeMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/HeightRangeMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/HeightRangeMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/HeightRangeMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/SmallBlockMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/SmallBlockMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/SmallBlockMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/SmallBlockMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/TxGroupMessage.java b/module/nuls-cores/src/main/java/io/nuls/block/message/TxGroupMessage.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/TxGroupMessage.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/TxGroupMessage.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/BlockHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/BlockHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/BlockHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/BlockHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/CompleteHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/CompleteHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/CompleteHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/CompleteHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/ForwardSmallBlockHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/ForwardSmallBlockHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/ForwardSmallBlockHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/ForwardSmallBlockHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/GetBlockByHeightHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetBlockByHeightHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/GetBlockByHeightHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetBlockByHeightHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/GetBlockHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetBlockHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/GetBlockHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetBlockHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/GetBlocksHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetBlocksHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/GetBlocksHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetBlocksHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/GetSmallBlockHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetSmallBlockHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/GetSmallBlockHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetSmallBlockHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/GetTxGroupHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetTxGroupHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/GetTxGroupHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/GetTxGroupHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java similarity index 98% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java index 71e1be4c43..2c3db5f5b5 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/SmallBlockHandler.java @@ -30,7 +30,7 @@ import io.nuls.block.message.SmallBlockMessage; import io.nuls.block.model.CachedSmallBlock; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.block.model.TxGroupTask; import io.nuls.block.rpc.call.NetworkCall; import io.nuls.block.rpc.call.TransactionCall; @@ -94,7 +94,7 @@ public void process(int chainId, String nodeId, String msgStr) { } NulsHash blockHash = header.getHash(); //阻止恶意节点提前出块,拒绝接收未来一定时间外的区块 - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); int validBlockInterval = parameters.getValidBlockInterval(); long currentTime = NulsDateUtils.getCurrentTimeMillis(); if (header.getTime() * 1000 > (currentTime + validBlockInterval)) { diff --git a/module/nuls-block/src/main/java/io/nuls/block/message/handler/TxGroupHandler.java b/module/nuls-cores/src/main/java/io/nuls/block/message/handler/TxGroupHandler.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/message/handler/TxGroupHandler.java rename to module/nuls-cores/src/main/java/io/nuls/block/message/handler/TxGroupHandler.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/BlockDownloaderParams.java b/module/nuls-cores/src/main/java/io/nuls/block/model/BlockDownloaderParams.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/BlockDownloaderParams.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/BlockDownloaderParams.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/CachedSmallBlock.java b/module/nuls-cores/src/main/java/io/nuls/block/model/CachedSmallBlock.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/CachedSmallBlock.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/CachedSmallBlock.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/Chain.java b/module/nuls-cores/src/main/java/io/nuls/block/model/Chain.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/Chain.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/Chain.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/ChainContext.java b/module/nuls-cores/src/main/java/io/nuls/block/model/ChainContext.java similarity index 97% rename from module/nuls-block/src/main/java/io/nuls/block/model/ChainContext.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/ChainContext.java index 089b5eb6c2..3a6ba3d4e0 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/model/ChainContext.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/model/ChainContext.java @@ -30,6 +30,7 @@ import io.nuls.block.utils.LoggerUtil; import io.nuls.block.utils.SingleBlockCacher; import io.nuls.block.utils.SmallBlockCacher; +import io.nuls.common.ConfigBean; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.model.CollectionUtils; @@ -84,7 +85,7 @@ public class ChainContext { /** * 链的运行时参数 */ - private ChainParameters parameters; + private ConfigBean parameters; /** * 获取锁对象 @@ -216,11 +217,11 @@ public void setGenesisBlock(Block genesisBlock) { this.genesisBlock = genesisBlock; } - public ChainParameters getParameters() { + public ConfigBean getParameters() { return parameters; } - public void setParameters(ChainParameters parameters) { + public void setParameters(ConfigBean parameters) { this.parameters = parameters; } @@ -275,6 +276,9 @@ public void setStatus(StatusEnum status) { } public long getLatestHeight() { + if (null == latestBlock || null == latestBlock.getHeader()) { + return -1; + } return latestBlock.getHeader().getHeight(); } diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/CheckResult.java b/module/nuls-cores/src/main/java/io/nuls/block/model/CheckResult.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/CheckResult.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/CheckResult.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/GenesisBlock.java b/module/nuls-cores/src/main/java/io/nuls/block/model/GenesisBlock.java similarity index 98% rename from module/nuls-block/src/main/java/io/nuls/block/model/GenesisBlock.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/GenesisBlock.java index 5f193e789a..9169b2a735 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/model/GenesisBlock.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/model/GenesisBlock.java @@ -36,6 +36,7 @@ import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; +import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.math.BigInteger; @@ -115,7 +116,7 @@ public static GenesisBlock getInstance(int chainId, int assetsId, String json) t } public static GenesisBlock getInstance(int chainId, int assetsId) throws Exception { - String json = IoUtils.read(GENESIS_BLOCK_FILE); + String json = IoUtils.read("block" + File.separator + GENESIS_BLOCK_FILE); return new GenesisBlock(chainId, assetsId, json); } diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/Node.java b/module/nuls-cores/src/main/java/io/nuls/block/model/Node.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/Node.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/Node.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/RollbackInfoPo.java b/module/nuls-cores/src/main/java/io/nuls/block/model/RollbackInfoPo.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/RollbackInfoPo.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/RollbackInfoPo.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/model/TxGroupTask.java b/module/nuls-cores/src/main/java/io/nuls/block/model/TxGroupTask.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/model/TxGroupTask.java rename to module/nuls-cores/src/main/java/io/nuls/block/model/TxGroupTask.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/BlockResource.java similarity index 99% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/BlockResource.java index f7254aa649..390130f671 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/rpc/BlockResource.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/rpc/BlockResource.java @@ -56,6 +56,7 @@ * @date 18-11-9 下午2:04 */ @Component +@NulsCoresCmd(module = ModuleE.BL) public class BlockResource extends BaseCmd { @Autowired private BlockService service; diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/ConsensusCall.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/ConsensusCall.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/call/ConsensusCall.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/call/ConsensusCall.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/ContractCall.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/ContractCall.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/call/ContractCall.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/call/ContractCall.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java similarity index 89% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java index f1e8cc38d4..a1bed0366e 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/CrossChainCall.java @@ -18,9 +18,10 @@ public class CrossChainCall { * @param chainId 链Id/chain id * @param height * @param blockHeader + * @param download 0区块下载中,1接收到最新区块 * @return */ - public static void heightNotice(int chainId, long height, String blockHeader) { + public static void heightNotice(int chainId, long height, String blockHeader, int download) { if (!ModuleHelper.isSupportCrossChain()) { return; } @@ -31,6 +32,7 @@ public static void heightNotice(int chainId, long height, String blockHeader) { params.put(Constants.CHAIN_ID, chainId); params.put("height", height); params.put("blockHeader", blockHeader); + params.put("download", download); ResponseMessageProcessor.requestAndResponse(ModuleE.CC.abbr, "newBlockHeight", params); } catch (Exception e) { logger.error("", e); diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/NetworkCall.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/NetworkCall.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/call/NetworkCall.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/call/NetworkCall.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/ProtocolCall.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/ProtocolCall.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/call/ProtocolCall.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/call/ProtocolCall.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/rpc/call/TransactionCall.java b/module/nuls-cores/src/main/java/io/nuls/block/rpc/call/TransactionCall.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/rpc/call/TransactionCall.java rename to module/nuls-cores/src/main/java/io/nuls/block/rpc/call/TransactionCall.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/service/BlockService.java b/module/nuls-cores/src/main/java/io/nuls/block/service/BlockService.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/service/BlockService.java rename to module/nuls-cores/src/main/java/io/nuls/block/service/BlockService.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java similarity index 99% rename from module/nuls-block/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java index 134d9f42e0..c47e2e5c44 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/service/impl/BlockServiceImpl.java @@ -30,7 +30,6 @@ import io.nuls.block.message.SmallBlockMessage; import io.nuls.block.model.Chain; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; import io.nuls.block.model.GenesisBlock; import io.nuls.block.rpc.call.*; import io.nuls.block.service.BlockService; @@ -40,6 +39,7 @@ import io.nuls.block.utils.ChainGenerator; import io.nuls.block.utils.LoggerUtil; import io.nuls.block.utils.SmallBlockCacher; +import io.nuls.common.ConfigBean; import io.nuls.core.basic.Result; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; @@ -48,7 +48,6 @@ import io.nuls.core.core.config.ConfigurationLoader; import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; -import io.nuls.core.log.Log; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.SerializeUtils; @@ -390,7 +389,7 @@ private boolean saveBlock(int chainId, Block block, boolean localInit, int downl } try { TransactionCall.heightNotice(chainId, height); - CrossChainCall.heightNotice(chainId, height, RPCUtil.encode(block.getHeader().serialize())); + CrossChainCall.heightNotice(chainId, height, RPCUtil.encode(block.getHeader().serialize()), download); } catch (Exception e) { LoggerUtil.COMMON_LOG.error(e); } @@ -528,7 +527,7 @@ public boolean rollbackBlock(int chainId, BlockHeaderPo blockHeaderPo, boolean n } try { TransactionCall.heightNotice(chainId, height - 1); - CrossChainCall.heightNotice(chainId, height - 1, RPCUtil.encode(blockHeader.serialize())); + CrossChainCall.heightNotice(chainId, height - 1, RPCUtil.encode(blockHeader.serialize()), 0); } catch (Exception e) { LoggerUtil.COMMON_LOG.error(e); } @@ -621,7 +620,7 @@ private boolean initLocalBlocks(int chainId) { genesisBlock = getGenesisBlock(chainId); //1.判断有没有创世块,如果没有就初始化创世块并保存 if (null == genesisBlock) { - ChainParameters chainParameters = context.getParameters(); + ConfigBean chainParameters = context.getParameters(); String genesisBlockPath = chainParameters.getGenesisBlockPath(); if (StringUtils.isBlank(genesisBlockPath)) { genesisBlock = GenesisBlock.getInstance(chainId, chainParameters.getAssetId()); diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/BlockStorageService.java b/module/nuls-cores/src/main/java/io/nuls/block/storage/BlockStorageService.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/storage/BlockStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/block/storage/BlockStorageService.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/ChainStorageService.java b/module/nuls-cores/src/main/java/io/nuls/block/storage/ChainStorageService.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/storage/ChainStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/block/storage/ChainStorageService.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/RollbackStorageService.java b/module/nuls-cores/src/main/java/io/nuls/block/storage/RollbackStorageService.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/storage/RollbackStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/block/storage/RollbackStorageService.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/impl/BlockStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/block/storage/impl/BlockStorageServiceImpl.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/storage/impl/BlockStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/block/storage/impl/BlockStorageServiceImpl.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/impl/ChainStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/block/storage/impl/ChainStorageServiceImpl.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/storage/impl/ChainStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/block/storage/impl/ChainStorageServiceImpl.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/storage/impl/RollbackServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/block/storage/impl/RollbackServiceImpl.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/storage/impl/RollbackServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/block/storage/impl/RollbackServiceImpl.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/test/BlockGenerator.java b/module/nuls-cores/src/main/java/io/nuls/block/test/BlockGenerator.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/test/BlockGenerator.java rename to module/nuls-cores/src/main/java/io/nuls/block/test/BlockGenerator.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/BlockConsumer.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/BlockConsumer.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/thread/BlockConsumer.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/BlockConsumer.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/BlockDownloader.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/BlockDownloader.java similarity index 98% rename from module/nuls-block/src/main/java/io/nuls/block/thread/BlockDownloader.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/BlockDownloader.java index d6a3f9359c..4a37ed8f08 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/BlockDownloader.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/BlockDownloader.java @@ -28,9 +28,9 @@ import io.nuls.block.message.HeightRangeMessage; import io.nuls.block.model.BlockDownloaderParams; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; import io.nuls.block.model.Node; import io.nuls.block.rpc.call.NetworkCall; +import io.nuls.common.ConfigBean; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.log.logback.NulsLogger; @@ -68,7 +68,7 @@ public Boolean call() { NulsLogger logger = context.getLogger(); try { logger.info("BlockDownloader start work from " + startHeight + " to " + netLatestHeight + ", nodes-" + nodes); - ChainParameters chainParameters = context.getParameters(); + ConfigBean chainParameters = context.getParameters(); long cachedBlockSizeLimit = chainParameters.getCachedBlockSizeLimit(); int downloadNumber = chainParameters.getDownloadNumber(); AtomicInteger cachedBlockSize = context.getCachedBlockSize(); diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/BlockSynchronizer.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/BlockSynchronizer.java similarity index 97% rename from module/nuls-block/src/main/java/io/nuls/block/thread/BlockSynchronizer.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/BlockSynchronizer.java index 0dbf08de04..e2680814b6 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/BlockSynchronizer.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/BlockSynchronizer.java @@ -39,6 +39,9 @@ import io.nuls.block.storage.RollbackStorageService; import io.nuls.block.utils.BlockUtil; import io.nuls.block.utils.ChainGenerator; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.model.DoubleUtils; @@ -117,6 +120,7 @@ public void run() { context.setStatus(StatusEnum.SYNCHRONIZING); NulsLogger logger = context.getLogger(); try { + CommonContext.START_BOOT.await(); BlockStorageService blockStorageService = SpringLiteContext.getBean(BlockStorageService.class); long latestHeight = blockStorageService.queryLatestHeight(chainId); BlockHeaderPo blockHeaderPo = blockStorageService.query(chainId, latestHeight); @@ -179,7 +183,7 @@ public void run() { * 回滚区块到指定高度 */ private void rollbackToHeight(long latestHeight, int chainId) { - BlockConfig blockConfig = SpringLiteContext.getBean(BlockConfig.class); + NulsCoresConfig blockConfig = SpringLiteContext.getBean(NulsCoresConfig.class); long height = blockConfig.getRollbackHeight(); if (height > 0) { RollbackStorageService rollbackService = SpringLiteContext.getBean(RollbackStorageService.class); @@ -209,7 +213,7 @@ private void rollbackToHeight(long latestHeight, int chainId) { */ private List waitUntilNetworkStable() throws InterruptedException { ChainContext context = ContextManager.getContext(chainId); - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); int waitNetworkInterval = parameters.getWaitNetworkInterval(); int minNodeAmount = parameters.getMinNodeAmount(); NulsLogger logger = context.getLogger(); @@ -238,7 +242,7 @@ private boolean synchronize() throws Exception { List availableNodes = waitUntilNetworkStable(); //2.判断可用节点数是否满足最小配置 ChainContext context = ContextManager.getContext(chainId); - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); int minNodeAmount = parameters.getMinNodeAmount(); if (minNodeAmount == 0 && availableNodes.isEmpty()) { logger.info("Skip block syn, because minNodeAmount is set to 0, minNodeAmount should't set to 0 otherwise you want run local node without connect with network"); @@ -382,7 +386,7 @@ BlockDownloaderParams statistics(List availableNodes, ChainContext context key = entry.getKey(); } } - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); double div = DoubleUtils.div(count, filterAvailableNodes.size(), 2); byte percent = calculateConsistencyNodePercent(parameters.getConsistencyNodePercent(), filterAvailableNodes.size()); if (div * 100 < percent) { @@ -476,7 +480,7 @@ private LocalBlockStateEnum checkLocalBlock(BlockDownloaderParams params) { private LocalBlockStateEnum checkRollback(int rollbackCount, BlockDownloaderParams params) { //每次最多回滚maxRollback个区块,等待下次同步,这样可以避免被恶意节点攻击,大量回滚正常区块. - ChainParameters parameters = ContextManager.getContext(chainId).getParameters(); + ConfigBean parameters = ContextManager.getContext(chainId).getParameters(); if (params.getLocalLatestHeight() == 0) { return CONFLICT; } diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/BaseMonitor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/BaseMonitor.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/BaseMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/BaseMonitor.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java similarity index 97% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java index 1938fa0889..5245d4d3c5 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/ForkChainsMonitor.java @@ -24,7 +24,7 @@ import io.nuls.block.manager.BlockChainManager; import io.nuls.block.model.Chain; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.block.model.CheckResult; import io.nuls.block.rpc.call.ConsensusCall; import io.nuls.block.rpc.call.TransactionCall; @@ -73,7 +73,7 @@ protected void process(int chainId, ChainContext context, NulsLogger commonLog) context.printChains(); //遍历当前分叉链,与主链进行比对,找出最大高度差,与默认参数chainSwtichThreshold对比,确定要切换的分叉链 Chain masterChain = BlockChainManager.getMasterChain(chainId); - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); int chainSwtichThreshold = parameters.getChainSwtichThreshold(); Chain switchChain = new Chain(); int maxHeightDifference = 0; diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java similarity index 96% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java index 3c4c60ed9b..df4032e7af 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/NetworkResetMonitor.java @@ -21,7 +21,7 @@ package io.nuls.block.thread.monitor; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.block.rpc.call.ConsensusCall; import io.nuls.block.rpc.call.NetworkCall; import io.nuls.block.rpc.call.TransactionCall; @@ -50,7 +50,7 @@ public static NetworkResetMonitor getInstance() { @Override protected void process(int chainId, ChainContext context, NulsLogger commonLog) { - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); long reset = parameters.getResetTime(); long time = context.getLatestBlock().getHeader().getTime() * 1000; //如果(当前时间戳-最新区块时间戳)>重置网络阈值,通知网络模块重置可用节点 diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java similarity index 96% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java index e4ff57c248..c9a9e52e64 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/NodesMonitor.java @@ -22,7 +22,7 @@ import io.nuls.block.constant.StatusEnum; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.block.rpc.call.ConsensusCall; import io.nuls.block.rpc.call.NetworkCall; import io.nuls.block.rpc.call.TransactionCall; @@ -55,7 +55,7 @@ private NodesMonitor() { @Override protected void process(int chainId, ChainContext context, NulsLogger commonLog) { - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); int minNodeAmount = parameters.getMinNodeAmount(); int size = NetworkCall.getAvailableNodes(chainId).size(); if (size < minNodeAmount && StatusEnum.RUNNING.equals(context.getStatus())) { diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java similarity index 98% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java index a82c3084f4..70bd58c378 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMaintainer.java @@ -26,7 +26,7 @@ import io.nuls.block.manager.ContextManager; import io.nuls.block.model.Chain; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.block.model.Node; import io.nuls.block.rpc.call.NetworkCall; import io.nuls.block.storage.ChainStorageService; @@ -70,7 +70,7 @@ public static OrphanChainsMaintainer getInstance() { @Override protected void process(int chainId, ChainContext context, NulsLogger commonLog) { - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); int orphanChainMaxAge = parameters.getOrphanChainMaxAge(); StampedLock lock = context.getLock(); diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMonitor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMonitor.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/OrphanChainsMonitor.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java similarity index 98% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java index a934d56e19..e976f7291f 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/StorageSizeMonitor.java @@ -25,7 +25,7 @@ import io.nuls.block.manager.ContextManager; import io.nuls.block.model.Chain; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.core.log.logback.NulsLogger; import java.util.SortedSet; @@ -52,7 +52,7 @@ public static StorageSizeMonitor getInstance() { @Override protected void process(int chainId, ChainContext context, NulsLogger commonLog) { //获取配置项 - ChainParameters parameters = ContextManager.getContext(chainId).getParameters(); + ConfigBean parameters = ContextManager.getContext(chainId).getParameters(); int heightRange = parameters.getHeightRange(); int orphanChainMaxAge = parameters.getOrphanChainMaxAge(); context.setStatus(StatusEnum.STORAGE_CLEANING); diff --git a/module/nuls-block/src/main/java/io/nuls/block/thread/monitor/TxGroupRequestor.java b/module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/TxGroupRequestor.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/thread/monitor/TxGroupRequestor.java rename to module/nuls-cores/src/main/java/io/nuls/block/thread/monitor/TxGroupRequestor.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/utils/BlockUtil.java b/module/nuls-cores/src/main/java/io/nuls/block/utils/BlockUtil.java similarity index 98% rename from module/nuls-block/src/main/java/io/nuls/block/utils/BlockUtil.java rename to module/nuls-cores/src/main/java/io/nuls/block/utils/BlockUtil.java index 9a049d0183..76fd09d4f3 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/utils/BlockUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/utils/BlockUtil.java @@ -30,7 +30,7 @@ import io.nuls.block.message.HeightMessage; import io.nuls.block.model.Chain; import io.nuls.block.model.ChainContext; -import io.nuls.block.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.block.rpc.call.ConsensusCall; import io.nuls.block.rpc.call.NetworkCall; import io.nuls.block.rpc.call.TransactionCall; @@ -94,7 +94,7 @@ public static boolean basicVerify(int chainId, Block block) { return false; } - ChainParameters parameters = ContextManager.getContext(chainId).getParameters(); + ConfigBean parameters = ContextManager.getContext(chainId).getParameters(); if (block.size() > parameters.getBlockMaxSize()) { logger.error("basicVerify fail, beyond blockMaxSize! height-" + header.getHeight() + ", hash-" + header.getHash()); return false; @@ -119,7 +119,7 @@ public static boolean headerVerify(int chainId, BlockHeader header) { logger.error("headerVerify fail, block packingAddress can not be null! height-" + header.getHeight() + ", hash-" + header.getHash()); return false; } - ChainParameters parameters = ContextManager.getContext(chainId).getParameters(); + ConfigBean parameters = ContextManager.getContext(chainId).getParameters(); if (header.getExtend() != null && header.getExtend().length > parameters.getExtendMaxSize()) { logger.error("headerVerify fail, block extend too long! height-" + header.getHeight() + ", hash-" + header.getHash()); return false; @@ -177,7 +177,7 @@ private static Result mainChainProcess(int chainId, Block block) { //1.收到的区块与主链最新高度差大于1000(可配置),丢弃 ChainContext context = ContextManager.getContext(chainId); - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); NulsLogger logger = context.getLogger(); if (Math.abs(blockHeight - masterChainEndHeight) > parameters.getHeightRange()) { logger.error("received out of range block, height:" + blockHeight + ", hash:" + blockHash); diff --git a/module/nuls-block/src/main/java/io/nuls/block/utils/ChainGenerator.java b/module/nuls-cores/src/main/java/io/nuls/block/utils/ChainGenerator.java similarity index 97% rename from module/nuls-block/src/main/java/io/nuls/block/utils/ChainGenerator.java rename to module/nuls-cores/src/main/java/io/nuls/block/utils/ChainGenerator.java index ae11730339..ea9d491ee6 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/utils/ChainGenerator.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/utils/ChainGenerator.java @@ -28,8 +28,8 @@ import io.nuls.block.constant.ChainTypeEnum; import io.nuls.block.manager.ContextManager; import io.nuls.block.model.Chain; -import io.nuls.block.model.ChainParameters; import io.nuls.block.service.BlockService; +import io.nuls.common.ConfigBean; import java.util.ArrayDeque; @@ -148,7 +148,7 @@ public static Chain generateMasterChain(int chainId, Block block, BlockService b chain.setPreviousHash(header.getPreHash()); chain.setStartHashCode(header.getHash().hashCode()); ArrayDeque hashs = new ArrayDeque<>(); - ChainParameters parameters = ContextManager.getContext(chainId).getParameters(); + ConfigBean parameters = ContextManager.getContext(chainId).getParameters(); int heightRange = parameters.getHeightRange(); long start = height - heightRange + 1; start = start >= 0 ? start : 0; diff --git a/module/nuls-block/src/main/java/io/nuls/block/utils/ConfigLoader.java b/module/nuls-cores/src/main/java/io/nuls/block/utils/ConfigLoader.java similarity index 72% rename from module/nuls-block/src/main/java/io/nuls/block/utils/ConfigLoader.java rename to module/nuls-cores/src/main/java/io/nuls/block/utils/ConfigLoader.java index f779a5ab61..3ec82d6d8b 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/utils/ConfigLoader.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/utils/ConfigLoader.java @@ -23,11 +23,11 @@ package io.nuls.block.utils; import io.nuls.block.manager.ContextManager; -import io.nuls.block.model.ChainParameters; -import io.nuls.block.storage.ParametersStorageService; -import io.nuls.core.core.annotation.Autowired; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; import io.nuls.core.core.annotation.Component; +import java.util.ArrayList; import java.util.List; import static io.nuls.block.BlockBootstrap.blockConfig; @@ -42,24 +42,18 @@ @Component public class ConfigLoader { - @Autowired - private static ParametersStorageService service; - /** * 加载配置文件 * * @throws Exception */ public static void load() { - List list = service.getList(); + List list = new ArrayList<>(CommonContext.CONFIG_BEAN_MAP.values()); if (list == null || list.isEmpty()) { loadDefault(); } else { - for (ChainParameters chainParameters : list) { + for (ConfigBean chainParameters : list) { ContextManager.init(chainParameters); -// int chainId = chainParameters.getChainId(); -// String protocolConfigJson = service.getProtocolConfigJson(chainId); -// ProtocolLoader.load(chainId, protocolConfigJson); } } } @@ -70,11 +64,7 @@ public static void load() { * @throws Exception */ private static void loadDefault() { -// String json = IoUtils.read(PROTOCOL_CONFIG_FILE); - int chainId = blockConfig.getChainId(); ContextManager.init(blockConfig); - service.save(blockConfig, chainId); -// service.saveProtocolConfigJson(json, chainId); } } diff --git a/module/nuls-block/src/main/java/io/nuls/block/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/block/utils/LoggerUtil.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/block/utils/LoggerUtil.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/utils/SingleBlockCacher.java b/module/nuls-cores/src/main/java/io/nuls/block/utils/SingleBlockCacher.java similarity index 100% rename from module/nuls-block/src/main/java/io/nuls/block/utils/SingleBlockCacher.java rename to module/nuls-cores/src/main/java/io/nuls/block/utils/SingleBlockCacher.java diff --git a/module/nuls-block/src/main/java/io/nuls/block/utils/SmallBlockCacher.java b/module/nuls-cores/src/main/java/io/nuls/block/utils/SmallBlockCacher.java similarity index 97% rename from module/nuls-block/src/main/java/io/nuls/block/utils/SmallBlockCacher.java rename to module/nuls-cores/src/main/java/io/nuls/block/utils/SmallBlockCacher.java index 0a56149b4f..7a1f0fa688 100644 --- a/module/nuls-block/src/main/java/io/nuls/block/utils/SmallBlockCacher.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/utils/SmallBlockCacher.java @@ -27,8 +27,8 @@ import io.nuls.block.constant.BlockForwardEnum; import io.nuls.block.manager.ContextManager; import io.nuls.block.model.CachedSmallBlock; -import io.nuls.block.model.ChainParameters; import io.nuls.block.service.BlockService; +import io.nuls.common.ConfigBean; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.model.CollectionUtils; @@ -144,7 +144,7 @@ public static void setStatus(int chainId, NulsHash blockHash, BlockForwardEnum b * @param chainId 链Id/chain id */ public static void init(int chainId) { - ChainParameters parameters = ContextManager.getContext(chainId).getParameters(); + ConfigBean parameters = ContextManager.getContext(chainId).getParameters(); int config = parameters.getSmallBlockCache(); Map map = CollectionUtils.getSynSizedMap(config); smallBlockCacheMap.put(chainId, map); diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/chain/ChainManagerBootstrap.java similarity index 63% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java rename to module/nuls-cores/src/main/java/io/nuls/chain/ChainManagerBootstrap.java index f939442eea..85f12bca68 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/ChainManagerBootstrap.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/ChainManagerBootstrap.java @@ -2,11 +2,7 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.protocol.CommonAdvice; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.ProtocolLoader; -import io.nuls.base.protocol.RegisterHelper; import io.nuls.base.protocol.cmd.TransactionDispatcher; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmConstants; import io.nuls.chain.info.CmRuntimeInfo; import io.nuls.chain.model.po.BlockChain; @@ -15,25 +11,21 @@ import io.nuls.chain.service.CacheDataService; import io.nuls.chain.service.ChainService; import io.nuls.chain.service.impl.ChainServiceImpl; -import io.nuls.chain.service.impl.CmTaskManager; import io.nuls.chain.service.tx.v1.ChainAssetCommitAdvice; import io.nuls.chain.service.tx.v1.ChainAssetRollbackAdvice; import io.nuls.chain.storage.InitDB; import io.nuls.chain.storage.impl.*; import io.nuls.chain.util.LoggerUtil; +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; import java.io.File; import java.math.BigDecimal; @@ -51,9 +43,9 @@ * @date 2018/11/7 */ @Component -public class ChainManagerBootstrap extends RpcModule { +public class ChainManagerBootstrap implements INulsCoresBootstrap { @Autowired - private NulsChainConfig nulsChainConfig; + private NulsCoresConfig nulsChainConfig; @Autowired private AddressPrefixDatas addressPrefixDatas; @Autowired @@ -61,21 +53,23 @@ public class ChainManagerBootstrap extends RpcModule { @Autowired private ChainService chainService; - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); + @Override + public int order() { + return 6; } + @Override + public void mainFunction(String[] args) { + this.init(); + } /** * 读取resources/module.ini，初始化配置 * Read resources/module.ini to initialize the configuration */ private void initCfg() throws Exception { - CmRuntimeInfo.nulsAssetId = nulsChainConfig.getMainAssetId(); - CmRuntimeInfo.nulsChainId = nulsChainConfig.getMainChainId(); + CmRuntimeInfo.nulsAssetId = String.valueOf(nulsChainConfig.getMainAssetId()); + CmRuntimeInfo.nulsChainId = String.valueOf(nulsChainConfig.getMainChainId()); long decimal = (long) Math.pow(10, Integer.valueOf(nulsChainConfig.getDefaultDecimalPlaces())); BigInteger initNumber = BigIntegerUtils.stringToBigInteger(nulsChainConfig.getNulsAssetInitNumberMax()).multiply( BigInteger.valueOf(decimal)); @@ -149,35 +143,15 @@ private void initChainDatas() throws Exception { } - @Override - public Module[] declareDependent() { - return new Module[]{ - Module.build(ModuleE.TX), - Module.build(ModuleE.LG), - Module.build(ModuleE.NW), - Module.build(ModuleE.AC), - Module.build(ModuleE.CS) - }; - } - @Override public Module moduleInfo() { return new Module(ModuleE.CM.abbr, "1.0"); } - /** - * 初始化模块信息，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 - */ - @Override public void init() { - super.init(); try { /* Read resources/module.ini to initialize the configuration */ initCfg(); - /** - * 地址工具初始化 - */ - AddressTool.init(addressPrefixDatas); LoggerUtil.logger().info("initCfg complete....."); /*storage info*/ initWithDatabase(); @@ -192,58 +166,44 @@ public void init() { } } - @Override - public boolean doStart() { + private boolean doStart() { TransactionDispatcher transactionDispatcher = SpringLiteContext.getBean(TransactionDispatcher.class); CommonAdvice commitAdvice = SpringLiteContext.getBean(ChainAssetCommitAdvice.class); CommonAdvice rollbackAdvice = SpringLiteContext.getBean(ChainAssetRollbackAdvice.class); - transactionDispatcher.register(commitAdvice, rollbackAdvice); + transactionDispatcher.register(ModuleE.CM, commitAdvice, rollbackAdvice); LoggerUtil.logger().info("doStart ok...."); return true; } - @Override - public void onDependenciesReady(Module module) { + public void onDependenciesReady() { try { - ProtocolLoader.load(CmRuntimeInfo.getMainIntChainId()); - /*注册交易处理器*/ - if (ModuleE.TX.abbr.equals(module.getName())) { - int chainId = CmRuntimeInfo.getMainIntChainId(); - boolean regSuccess = RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); - if (!regSuccess) { - LoggerUtil.logger().error("RegisterHelper.registerTx fail.."); - System.exit(-1); - } - LoggerUtil.logger().info("regTxRpc complete....."); + doStart(); + try { + /* 进行数据库数据初始化（避免异常关闭造成的事务不一致） */ + initChainDatas(); + } catch (Exception e) { + LoggerUtil.logger().error(e); + LoggerUtil.logger().error("启动异常退出...."); + System.exit(-1); } - if (ModuleE.PU.abbr.equals(module.getName())) { - //注册相关交易 - boolean regSuccess = RegisterHelper.registerProtocol(CmRuntimeInfo.getMainIntChainId()); - if (!regSuccess) { - LoggerUtil.logger().error("RegisterHelper.registerProtocol fail.."); - System.exit(-1); - } - LoggerUtil.logger().info("register protocol ..."); - } - if (ModuleE.AC.abbr.equals(module.getName())) { - //取跨链注册地址前缀数据给AC - try { - List blockChains = chainService.getBlockList(); - List> list = new ArrayList<>(); - for (BlockChain blockChain : blockChains) { - if (blockChain.getChainId() == Integer.valueOf(nulsChainConfig.getMainChainId())) { - continue; - } - Map prefix = new HashMap<>(); - prefix.put("chainId", blockChain.getChainId()); - prefix.put("addressPrefix", blockChain.getAddressPrefix()); - list.add(prefix); + //取跨链注册地址前缀数据给AC + try { + List blockChains = chainService.getBlockList(); + List> list = new ArrayList<>(); + for (BlockChain blockChain : blockChains) { + if (blockChain.getChainId() == Integer.valueOf(nulsChainConfig.getMainChainId())) { + continue; } - rpcService.addAcAddressPrefix(list); - } catch (Exception e) { - LoggerUtil.logger().error(e); + Map prefix = new HashMap<>(); + prefix.put("chainId", blockChain.getChainId()); + prefix.put("addressPrefix", blockChain.getAddressPrefix()); + list.add(prefix); } + rpcService.addAcAddressPrefix(list); + } catch (Exception e) { + LoggerUtil.logger().error(e); } + LoggerUtil.logger().info("onDependenciesReady ok...."); } catch (Exception e) { LoggerUtil.logger().error(e); System.exit(-1); @@ -251,25 +211,4 @@ public void onDependenciesReady(Module module) { } } - @Override - public RpcModuleState onDependenciesReady() { - try { - /* 进行数据库数据初始化（避免异常关闭造成的事务不一致） */ - initChainDatas(); - } catch (Exception e) { - LoggerUtil.logger().error(e); - LoggerUtil.logger().error("启动异常退出...."); - System.exit(-1); - } -// CmTaskManager cmTaskManager = SpringLiteContext.getBean(CmTaskManager.class); -// cmTaskManager.start(); - NulsDateUtils.getInstance().start(5 * 60 * 1000); - LoggerUtil.logger().info("onDependenciesReady ok...."); - return RpcModuleState.Running; - } - - @Override - public RpcModuleState onDependenciesLoss(Module dependenciesModule) { - return RpcModuleState.Start; - } } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/info/CmConstants.java b/module/nuls-cores/src/main/java/io/nuls/chain/info/CmConstants.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/info/CmConstants.java rename to module/nuls-cores/src/main/java/io/nuls/chain/info/CmConstants.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/info/CmErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/chain/info/CmErrorCode.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/info/CmErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/chain/info/CmErrorCode.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/info/CmRuntimeInfo.java b/module/nuls-cores/src/main/java/io/nuls/chain/info/CmRuntimeInfo.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/info/CmRuntimeInfo.java rename to module/nuls-cores/src/main/java/io/nuls/chain/info/CmRuntimeInfo.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/info/RpcConstants.java b/module/nuls-cores/src/main/java/io/nuls/chain/info/RpcConstants.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/info/RpcConstants.java rename to module/nuls-cores/src/main/java/io/nuls/chain/info/RpcConstants.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/AccountBalance.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/AccountBalance.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/AccountBalance.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/AccountBalance.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/AssetDto.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/AssetDto.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/AssetDto.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/AssetDto.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/ChainAssetTotalCirculate.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/ChainAssetTotalCirculate.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/ChainAssetTotalCirculate.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/ChainAssetTotalCirculate.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/ChainDto.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/ChainDto.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/ChainDto.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/ChainDto.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/ChainEventResult.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/ChainEventResult.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/ChainEventResult.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/ChainEventResult.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/CoinDataAssets.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/CoinDataAssets.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/CoinDataAssets.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/CoinDataAssets.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/RegAssetDto.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/RegAssetDto.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/RegAssetDto.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/RegAssetDto.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/RegChainDto.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/RegChainDto.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/RegChainDto.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/RegChainDto.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/Seed.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/dto/Seed.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/dto/Seed.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/dto/Seed.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/Asset.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/po/Asset.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/Asset.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/po/Asset.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/BlockChain.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/po/BlockChain.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/BlockChain.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/po/BlockChain.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/BlockHeight.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/po/BlockHeight.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/BlockHeight.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/po/BlockHeight.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/CacheDatas.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/po/CacheDatas.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/CacheDatas.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/po/CacheDatas.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/ChainAsset.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/po/ChainAsset.java similarity index 83% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/ChainAsset.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/po/ChainAsset.java index 37d8464bc8..7e1f878ad8 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/po/ChainAsset.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/model/po/ChainAsset.java @@ -125,4 +125,23 @@ public void setOutNumber(BigInteger outNumber) { public boolean isFromChainAsset(){ return (addressChainId == assetChainId); } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"addressChainId\":") + .append(addressChainId); + sb.append(",\"assetChainId\":") + .append(assetChainId); + sb.append(",\"assetId\":") + .append(assetId); + sb.append(",\"initNumber\":") + .append(initNumber); + sb.append(",\"inNumber\":") + .append(inNumber); + sb.append(",\"outNumber\":") + .append(outNumber); + sb.append('}'); + return sb.toString(); + } } diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/AddAssetToChainTransaction.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/AddAssetToChainTransaction.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/AddAssetToChainTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/AddAssetToChainTransaction.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/BlockChainTxType.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/BlockChainTxType.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/BlockChainTxType.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/BlockChainTxType.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/DestroyAssetAndChainTransaction.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/DestroyAssetAndChainTransaction.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/DestroyAssetAndChainTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/DestroyAssetAndChainTransaction.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/RegisterChainAndAssetTransaction.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/RegisterChainAndAssetTransaction.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/RegisterChainAndAssetTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/RegisterChainAndAssetTransaction.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/RemoveAssetFromChainTransaction.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/RemoveAssetFromChainTransaction.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/RemoveAssetFromChainTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/RemoveAssetFromChainTransaction.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdata/TxAsset.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdata/TxAsset.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdata/TxAsset.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdata/TxAsset.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdata/TxChain.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdata/TxChain.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdata/TxChain.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdata/TxChain.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdatav5/TxAsset.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdatav5/TxAsset.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdatav5/TxAsset.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdatav5/TxAsset.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdatav5/TxChain.java b/module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdatav5/TxChain.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/model/tx/txdatav5/TxChain.java rename to module/nuls-cores/src/main/java/io/nuls/chain/model/tx/txdatav5/TxChain.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/call/RpcService.java b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/call/RpcService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/call/RpcService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/rpc/call/RpcService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/call/impl/RpcServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/call/impl/RpcServiceImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/call/impl/RpcServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/rpc/call/impl/RpcServiceImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java similarity index 99% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java rename to module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java index 6ce2f52d50..11e81ffebe 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java @@ -4,7 +4,6 @@ import io.nuls.base.data.CoinData; import io.nuls.base.data.Transaction; import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmConstants; import io.nuls.chain.info.CmErrorCode; import io.nuls.chain.info.CmRuntimeInfo; @@ -23,6 +22,7 @@ import io.nuls.chain.util.ChainManagerUtil; import io.nuls.chain.util.LoggerUtil; import io.nuls.chain.util.TxUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.ErrorCode; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -44,6 +44,7 @@ * @description */ @Component +@NulsCoresCmd(module = ModuleE.CM) public class AssetCmd extends BaseChainCmd { @Autowired @@ -53,7 +54,7 @@ public class AssetCmd extends BaseChainCmd { @Autowired private RpcService rpcService; @Autowired - private NulsChainConfig nulsChainConfig; + private NulsCoresConfig nulsChainConfig; /** * 资产注册 diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java rename to module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/CmmChainCmd.java similarity index 99% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java rename to module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/CmmChainCmd.java index 185324c74f..acc6aa2dbf 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/ChainCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/CmmChainCmd.java @@ -29,7 +29,6 @@ import io.nuls.base.data.CoinData; import io.nuls.base.data.Transaction; import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmConstants; import io.nuls.chain.info.CmErrorCode; import io.nuls.chain.info.CmRuntimeInfo; @@ -46,7 +45,7 @@ import io.nuls.chain.util.ChainManagerUtil; import io.nuls.chain.util.LoggerUtil; import io.nuls.chain.util.TxUtil; -import io.nuls.core.constant.BaseConstant; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.ErrorCode; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -70,7 +69,8 @@ * @description */ @Component -public class ChainCmd extends BaseChainCmd { +@NulsCoresCmd(module = ModuleE.CM) +public class CmmChainCmd extends BaseChainCmd { @Autowired private ChainService chainService; @@ -79,7 +79,7 @@ public class ChainCmd extends BaseChainCmd { @Autowired private RpcService rpcService; @Autowired - NulsChainConfig nulsChainConfig; + NulsCoresConfig nulsChainConfig; @CmdAnnotation(cmd = RpcConstants.CMD_CHAIN, version = 1.0, description = "查看链信息") diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java similarity index 99% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java rename to module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java index 6cec51047f..2462b65442 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/TxCirculateCmd.java @@ -58,6 +58,7 @@ * @date 2019/02/21 **/ @Component +@NulsCoresCmd(module = ModuleE.CM) public class TxCirculateCmd extends BaseChainCmd { diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/AssetService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/AssetService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/AssetService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/AssetService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/CacheDataService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/CacheDataService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/CacheDataService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/CacheDataService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ChainService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/ChainService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ChainService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/ChainService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/CmTransferService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/CmTransferService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/CmTransferService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/CmTransferService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/MessageService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/MessageService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/MessageService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/MessageService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/TxCirculateService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/TxCirculateService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/TxCirculateService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/TxCirculateService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/ValidateService.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/ValidateService.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/ValidateService.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java similarity index 98% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java index 5bf30af682..cc29b026a0 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/AssetServiceImpl.java @@ -1,7 +1,5 @@ package io.nuls.chain.service.impl; -import io.nuls.base.basic.AddressTool; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmRuntimeInfo; import io.nuls.chain.model.po.Asset; import io.nuls.chain.model.po.BlockChain; @@ -14,6 +12,7 @@ import io.nuls.chain.storage.ChainCirculateStorage; import io.nuls.chain.util.LoggerUtil; import io.nuls.chain.util.TxUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.model.BigIntegerUtils; @@ -44,7 +43,7 @@ public class AssetServiceImpl implements AssetService { @Autowired private RpcService rpcService; @Autowired - private NulsChainConfig nulsChainConfig; + private NulsCoresConfig nulsChainConfig; @Autowired private ChainCirculateStorage chainCirculateStorage; diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CacheDataServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CacheDataServiceImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CacheDataServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CacheDataServiceImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java similarity index 98% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java index 15d011aac7..cf33fe3a3e 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/ChainServiceImpl.java @@ -1,7 +1,6 @@ package io.nuls.chain.service.impl; import io.nuls.base.data.Transaction; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmRuntimeInfo; import io.nuls.chain.model.po.Asset; import io.nuls.chain.model.po.BlockChain; @@ -10,6 +9,7 @@ import io.nuls.chain.service.ChainService; import io.nuls.chain.storage.ChainStorage; import io.nuls.chain.util.TxUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Service; @@ -28,7 +28,7 @@ @Service public class ChainServiceImpl implements ChainService { @Autowired - private NulsChainConfig nulsChainConfig; + private NulsCoresConfig nulsChainConfig; @Autowired private ChainStorage chainStorage; @@ -86,7 +86,7 @@ public void initMainChain() throws Exception { return; } chain = new BlockChain(); - int assetId = Integer.parseInt(nulsChainConfig.getMainAssetId()); + int assetId = Integer.valueOf(nulsChainConfig.getMainAssetId()); chain.setChainId(chainId); chain.setRegAssetId(assetId); chain.setChainName(nulsChainConfig.getChainName()); diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java similarity index 91% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java index 0a127ce85f..735efb2367 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CmTaskManager.java @@ -24,11 +24,9 @@ */ package io.nuls.chain.service.impl; -import io.nuls.chain.config.NulsChainConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.core.thread.ThreadUtils; -import io.nuls.core.thread.commom.NulsThreadFactory; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -42,7 +40,7 @@ @Component public class CmTaskManager { @Autowired - private NulsChainConfig nulsChainConfig; + private NulsCoresConfig nulsChainConfig; private ScheduledThreadPoolExecutor executorService; diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTransferServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CmTransferServiceImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/CmTransferServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/CmTransferServiceImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/MessageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/MessageServiceImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/MessageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/MessageServiceImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java similarity index 98% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java index 86a7f77246..8cad767f71 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/TxCirculateServiceImpl.java @@ -29,7 +29,6 @@ import io.nuls.base.data.CoinFrom; import io.nuls.base.data.CoinTo; import io.nuls.base.data.Transaction; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmRuntimeInfo; import io.nuls.chain.model.dto.ChainEventResult; import io.nuls.chain.model.dto.CoinDataAssets; @@ -40,6 +39,8 @@ import io.nuls.chain.service.ChainService; import io.nuls.chain.service.TxCirculateService; import io.nuls.chain.storage.ChainAssetStorage; +import io.nuls.chain.util.LoggerUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Service; import io.nuls.core.exception.NulsException; @@ -62,7 +63,7 @@ public class TxCirculateServiceImpl implements TxCirculateService { @Autowired ChainAssetStorage chainAssetStorage; @Autowired - NulsChainConfig nulsChainConfig; + NulsCoresConfig nulsChainConfig; @Override public List getChainAssetList(byte[] coinDataByte) throws NulsException { @@ -129,7 +130,6 @@ boolean isMainChain(int chainId) { @Override public ChainEventResult circulateCommit(List txs) throws Exception { - Map batchUpdateBlockChain = new HashMap<>(); Map batchUpdateAsset = new HashMap<>(); Map batchUpdateChainAsset = new HashMap<>(); diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java similarity index 99% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java index 820f83d681..ae0f605ea2 100644 --- a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/chain/service/impl/ValidateServiceImpl.java @@ -25,7 +25,6 @@ package io.nuls.chain.service.impl; import io.nuls.base.basic.AddressTool; -import io.nuls.chain.config.NulsChainConfig; import io.nuls.chain.info.CmConstants; import io.nuls.chain.info.CmErrorCode; import io.nuls.chain.info.CmRuntimeInfo; @@ -38,6 +37,7 @@ import io.nuls.chain.service.ValidateService; import io.nuls.chain.util.ChainManagerUtil; import io.nuls.chain.util.LoggerUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Service; import io.nuls.core.log.Log; @@ -64,7 +64,7 @@ public class ValidateServiceImpl implements ValidateService { @Autowired ChainService chainService; @Autowired - private NulsChainConfig nulsChainConfig; + private NulsCoresConfig nulsChainConfig; @Override public ChainEventResult assetDisableValidator(Asset asset) throws Exception { diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/AddAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/AddAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/AddAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/AddAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetCommitAdvice.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetCommitAdvice.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetCommitAdvice.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetCommitAdvice.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetRollbackAdvice.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetRollbackAdvice.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetRollbackAdvice.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/ChainAssetRollbackAdvice.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/DestroyChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/DestroyChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/DestroyChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/DestroyChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/DisableAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/DisableAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/DisableAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/DisableAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/RegChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/RegChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v1/RegChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v1/RegChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v12/AddAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v15/AddAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v15/RegChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/AddAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/AddAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/AddAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/AddAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/DestroyChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/DestroyChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/DestroyChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/DestroyChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/DisableAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/DisableAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/DisableAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/DisableAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/RegChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/RegChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v5/RegChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v5/RegChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/AddAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/AddAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/AddAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/AddAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/DestroyChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/DestroyChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/DestroyChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/DestroyChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/DisableAssetTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/DisableAssetTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/DisableAssetTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/DisableAssetTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/RegChainTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/RegChainTransferProcessor.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/service/tx/v7/RegChainTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/chain/service/tx/v7/RegChainTransferProcessor.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/AssetStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/AssetStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/AssetStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/AssetStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/BlockHeightStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/BlockHeightStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/BlockHeightStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/BlockHeightStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/CacheDatasStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/CacheDatasStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/CacheDatasStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/CacheDatasStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/ChainAssetStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/ChainAssetStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/ChainAssetStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/ChainAssetStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/ChainCirculateStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/ChainCirculateStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/ChainCirculateStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/ChainCirculateStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/ChainStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/ChainStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/ChainStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/ChainStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/InitDB.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/InitDB.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/InitDB.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/InitDB.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/AssetStorageImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/AssetStorageImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/AssetStorageImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/AssetStorageImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/BaseStorage.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/BaseStorage.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/BaseStorage.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/BaseStorage.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/BlockHeightStorageImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/BlockHeightStorageImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/BlockHeightStorageImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/BlockHeightStorageImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/CacheDatasStorageImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/CacheDatasStorageImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/CacheDatasStorageImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/CacheDatasStorageImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/ChainAssetStorageImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/ChainAssetStorageImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/ChainAssetStorageImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/ChainAssetStorageImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/ChainCirculateStorageImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/ChainCirculateStorageImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/ChainCirculateStorageImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/ChainCirculateStorageImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/ChainStorageImpl.java b/module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/ChainStorageImpl.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/storage/impl/ChainStorageImpl.java rename to module/nuls-cores/src/main/java/io/nuls/chain/storage/impl/ChainStorageImpl.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/task/ChainAssetUpdateTask.java b/module/nuls-cores/src/main/java/io/nuls/chain/task/ChainAssetUpdateTask.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/task/ChainAssetUpdateTask.java rename to module/nuls-cores/src/main/java/io/nuls/chain/task/ChainAssetUpdateTask.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/util/ChainManagerUtil.java b/module/nuls-cores/src/main/java/io/nuls/chain/util/ChainManagerUtil.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/util/ChainManagerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/chain/util/ChainManagerUtil.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/util/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/chain/util/LoggerUtil.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/util/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/chain/util/LoggerUtil.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/util/ResponseUtil.java b/module/nuls-cores/src/main/java/io/nuls/chain/util/ResponseUtil.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/util/ResponseUtil.java rename to module/nuls-cores/src/main/java/io/nuls/chain/util/ResponseUtil.java diff --git a/module/nuls-chain-manager/src/main/java/io/nuls/chain/util/TxUtil.java b/module/nuls-cores/src/main/java/io/nuls/chain/util/TxUtil.java similarity index 100% rename from module/nuls-chain-manager/src/main/java/io/nuls/chain/util/TxUtil.java rename to module/nuls-cores/src/main/java/io/nuls/chain/util/TxUtil.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigItem.java b/module/nuls-cores/src/main/java/io/nuls/common/CommonContext.java similarity index 56% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigItem.java rename to module/nuls-cores/src/main/java/io/nuls/common/CommonContext.java index a1f8409339..54ea0b0c68 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigItem.java +++ b/module/nuls-cores/src/main/java/io/nuls/common/CommonContext.java @@ -1,18 +1,18 @@ -/* +/** * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * + *

+ * Copyright (c) 2017-2018 nuls.io + *

* Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,52 +20,22 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * */ -package io.nuls.contract.model.bo.config; +package io.nuls.common; + +import io.nuls.core.rpc.model.InvokeBean; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CountDownLatch; /** - * 配置信息类 - * Configuration information class - * * @author: PierreLuo - * @date: 2019-02-26 + * @date: 2022/1/24 */ -public class ConfigItem { - private String key; - private Object value; - private boolean readOnly; - - public ConfigItem() { - - } - - public ConfigItem(Object value, boolean readOnly) { - this.value = value; - this.readOnly = readOnly; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public boolean isReadOnly() { - return readOnly; - } +public class CommonContext { - public void setReadOnly(boolean readOnly) { - this.readOnly = readOnly; - } + public static final Map INVOKE_BEAN_MAP = new HashMap<>(); + public static final Map CONFIG_BEAN_MAP = new HashMap<>(); + public static final CountDownLatch START_BOOT = new CountDownLatch(1); } diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigItem.java b/module/nuls-cores/src/main/java/io/nuls/common/CommonVersionChangeInvoker.java similarity index 55% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigItem.java rename to module/nuls-cores/src/main/java/io/nuls/common/CommonVersionChangeInvoker.java index 106bca25d1..577dcf46e7 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigItem.java +++ b/module/nuls-cores/src/main/java/io/nuls/common/CommonVersionChangeInvoker.java @@ -1,18 +1,18 @@ -/* +/** * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * + *

+ * Copyright (c) 2017-2018 nuls.io + *

* Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,51 +20,35 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * */ -package io.nuls.account.model.bo.config; +package io.nuls.common; -/** - * 配置信息类 - * Configuration information class - * - * @author qinyifeng - * @date 2018/11/11 - */ -public class ConfigItem { - private String key; - private Object value; - private boolean readOnly; +import io.nuls.core.basic.VersionChangeInvoker; - public ConfigItem(){ +import java.util.ArrayList; +import java.util.List; - } - public ConfigItem( Object value, boolean readOnly) { - this.value = value; - this.readOnly = readOnly; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public Object getValue() { - return value; - } +/** + * @author: PierreLuo + * @date: 2023/7/31 + */ +public class CommonVersionChangeInvoker implements VersionChangeInvoker { - public void setValue(Object value) { - this.value = value; + private static CommonVersionChangeInvoker commonVersionChangeInvoker = new CommonVersionChangeInvoker(); + private CommonVersionChangeInvoker() {} + public static CommonVersionChangeInvoker instance() { + return commonVersionChangeInvoker; } - public boolean isReadOnly() { - return readOnly; + private static List invokers = new ArrayList<>(); + public static void addProcess(VersionChangeInvoker invoker) { + invokers.add(invoker); } - public void setReadOnly(boolean readOnly) { - this.readOnly = readOnly; + @Override + public void process(int chainId) { + for (VersionChangeInvoker invoker : invokers) { + invoker.process(chainId); + } } } diff --git a/module/nuls-cores/src/main/java/io/nuls/common/ConfigBean.java b/module/nuls-cores/src/main/java/io/nuls/common/ConfigBean.java new file mode 100644 index 0000000000..fb743dbc31 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/common/ConfigBean.java @@ -0,0 +1,817 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.common; + +import java.math.BigInteger; +import java.util.HashSet; +import java.util.Set; + +/** + * Transaction module chain setting + * @author: Charlie + * @date: 2019/03/14 + */ +public class ConfigBean { + + /** chain id*/ + private int chainId; + /** assets id*/ + private int assetId; + /*-------------------------[Block]-----------------------------*/ + /** + * 区块大小阈值 + */ + private long blockMaxSize; + /** + * 网络重置阈值 + */ + private long resetTime; + /** + * 分叉链比主链高几个区块就进行链切换 + */ + private byte chainSwtichThreshold; + /** + * 分叉链、孤儿链区块最大缓存数量 + */ + private int cacheSize; + /** + * 接收新区块的范围 + */ + private int heightRange; + /** + * 每次回滚区块最大值 + */ + private int maxRollback; + /** + * 一致节点比例 + */ + private byte consistencyNodePercent; + /** + * 系统运行最小节点数 + */ + private byte minNodeAmount; + /** + * 每次从一个节点下载多少区块 + */ + private byte downloadNumber; + /** + * 区块头中扩展字段的最大长度 + */ + private int extendMaxSize; + /** + * 为阻止恶意节点提前出块,设置此参数 + * 区块时间戳大于当前时间多少就丢弃该区块 + */ + private int validBlockInterval; + /** + * 系统正常运行时最多缓存多少个从别的节点接收到的小区块 + */ + private byte smallBlockCache; + /** + * 孤儿链最大年龄 + */ + private byte orphanChainMaxAge; + /** + * 日志级别 + */ + private String logLevel; + /** + * 下载单个区块的超时时间 + */ + private int singleDownloadTimeout; + + /** + * 等待网络稳定的时间间隔 + */ + private int waitNetworkInterval; + + /** + * 创世区块配置文件路径 + */ + private String genesisBlockPath; + + /** + * 区块同步过程中缓存的区块字节数上限 + */ + private long cachedBlockSizeLimit; + /*-------------------------[Protocol]-----------------------------*/ + /** + * 统计区间 + */ + private short interval; + /** + * 每个统计区间内的最小生效比例 + */ + private byte effectiveRatioMinimum; + /** + * 协议生效要满足的连续区间数最小值 + */ + private short continuousIntervalCountMinimum; + /*-------------------------[CrossChain]-----------------------------*/ + /** + * 最小链接数 + * Minimum number of links + * */ + private int minNodes; + + /** + * 最大链接数 + * */ + private int maxOutAmount; + + /** + * 最大被链接数 + * */ + private int maxInAmount; + + /** + * 跨链交易被打包多少块之后广播给其他链 + * */ + private int sendHeight; + + /** + * 拜占庭比例 + * */ + private int byzantineRatio; + + /** + * 最小签名数 + * */ + private int minSignature; + + /** + * 主网验证人信息 + * */ + private String verifiers; + + /** + * 主网拜占庭比例 + * */ + private int mainByzantineRatio; + + /** + * 主网最大签名验证数 + * */ + private int maxSignatureCount; + + /** + * 主网验证人列表 + * */ + private Set verifierSet = new HashSet<>(); + + /*-------------------------[Consensus]-----------------------------*/ + + /** + * 打包间隔时间 + * Packing interval time + */ + private long packingInterval; + /** + * 获得红牌保证金锁定时间 + * Lock-in time to get a red card margin + */ + private long redPublishLockTime; + /** + * 注销节点保证金锁定时间 + * Log-off node margin locking time + */ + private long stopAgentLockTime; + /** + * 佣金比例的最小值 + * Minimum commission ratio + */ + private byte commissionRateMin; + /** + * 佣金比例的最大值 + * Maximum commission ratio + */ + private byte commissionRateMax; + /** + * 创建节点的保证金最小值 + * Minimum margin for creating nodes + */ + private BigInteger depositMin; + /** + * 创建节点的保证金最大值 + * Maximum margin for creating nodes + */ + private BigInteger depositMax; + /** + * 节点出块委托金额最小值 + * Minimum Delegation Amount of Node Block + */ + private BigInteger commissionMin; + /** + * 节点委托金额最大值 + * Maximum Node Delegation Amount + */ + private BigInteger commissionMax; + + /** + * 委托最小金额 + * Minimum amount entrusted + */ + private BigInteger entrusterDepositMin; + + /** + * 种子节点 + * Seed node + */ + private String seedNodes; + + /** + * 出块节点密码 + * */ + private String password; + + /** + * 打包一个区块获得的共识奖励 + * 每年通胀/每年出块数 + * */ + private BigInteger blockReward; + + + /** + * 创建节点资产ID + * agent assets id + */ + private int agentAssetId; + + /** + * 创建节点资产链ID + * Create node asset chain ID + */ + private int agentChainId; + + + /** + * 共识奖励资产ID + * Award asset chain ID + */ + private int awardAssetId; + + /** + * 交易手续费单价 + * Transaction fee unit price + */ + private long feeUnit; + + /** + * 总通缩量 + * Total inflation amount + */ + private BigInteger totalInflationAmount; + + /** + * 初始通胀金额 + * Initial Inflation Amount + */ + private BigInteger inflationAmount; + + /** + * 通胀开始时间 + * */ + private long initTime; + + /** + * 通缩比例 + * */ + private double deflationRatio; + + /** + * 通缩间隔时间 + * */ + private long deflationTimeInterval; + + /*-------------------------[SmartContract]-----------------------------*/ + /** + * view方法最大消耗gas + */ + private long maxViewGas; + + /*-------------------------[Transaction]-----------------------------*/ + /** 单个交易数据最大值(B)*/ + private long txMaxSize; + /** + * 打包时在获取交易之后留给模块统一验证的时间阈值, + * 包括统一验证有被过滤掉的交易时需要重新验证等. + */ + private int moduleVerifyPercent; + /** 打包获取交易给RPC传输到共识的预留时间,超时则需要处理交易还原待打包队列*/ + private int packageRpcReserveTime; + /** 接收网络新交易队列的最大容量 未处理的交易队列**/ + private long txUnverifiedQueueSize; + /** 孤儿交易生命时间,超过会被清理**/ + private int orphanTtl; + /*----------------------------------------------------------------------*/ + + public int getChainId() { + return chainId; + } + + public void setChainId(int chainId) { + this.chainId = chainId; + } + + public int getAssetId() { + return assetId; + } + + public void setAssetId(int assetId) { + this.assetId = assetId; + } + + public long getBlockMaxSize() { + return blockMaxSize; + } + + public void setBlockMaxSize(long blockMaxSize) { + this.blockMaxSize = blockMaxSize; + } + + public long getResetTime() { + return resetTime; + } + + public void setResetTime(long resetTime) { + this.resetTime = resetTime; + } + + public byte getChainSwtichThreshold() { + return chainSwtichThreshold; + } + + public void setChainSwtichThreshold(byte chainSwtichThreshold) { + this.chainSwtichThreshold = chainSwtichThreshold; + } + + public int getCacheSize() { + return cacheSize; + } + + public void setCacheSize(int cacheSize) { + this.cacheSize = cacheSize; + } + + public int getHeightRange() { + return heightRange; + } + + public void setHeightRange(int heightRange) { + this.heightRange = heightRange; + } + + public int getMaxRollback() { + return maxRollback; + } + + public void setMaxRollback(int maxRollback) { + this.maxRollback = maxRollback; + } + + public byte getConsistencyNodePercent() { + return consistencyNodePercent; + } + + public void setConsistencyNodePercent(byte consistencyNodePercent) { + this.consistencyNodePercent = consistencyNodePercent; + } + + public byte getMinNodeAmount() { + return minNodeAmount; + } + + public void setMinNodeAmount(byte minNodeAmount) { + this.minNodeAmount = minNodeAmount; + } + + public byte getDownloadNumber() { + return downloadNumber; + } + + public void setDownloadNumber(byte downloadNumber) { + this.downloadNumber = downloadNumber; + } + + public int getExtendMaxSize() { + return extendMaxSize; + } + + public void setExtendMaxSize(int extendMaxSize) { + this.extendMaxSize = extendMaxSize; + } + + public int getValidBlockInterval() { + return validBlockInterval; + } + + public void setValidBlockInterval(int validBlockInterval) { + this.validBlockInterval = validBlockInterval; + } + + public byte getSmallBlockCache() { + return smallBlockCache; + } + + public void setSmallBlockCache(byte smallBlockCache) { + this.smallBlockCache = smallBlockCache; + } + + public byte getOrphanChainMaxAge() { + return orphanChainMaxAge; + } + + public void setOrphanChainMaxAge(byte orphanChainMaxAge) { + this.orphanChainMaxAge = orphanChainMaxAge; + } + + public String getLogLevel() { + return logLevel; + } + + public void setLogLevel(String logLevel) { + this.logLevel = logLevel; + } + + public int getSingleDownloadTimeout() { + return singleDownloadTimeout; + } + + public void setSingleDownloadTimeout(int singleDownloadTimeout) { + this.singleDownloadTimeout = singleDownloadTimeout; + } + + public int getWaitNetworkInterval() { + return waitNetworkInterval; + } + + public void setWaitNetworkInterval(int waitNetworkInterval) { + this.waitNetworkInterval = waitNetworkInterval; + } + + public String getGenesisBlockPath() { + return genesisBlockPath; + } + + public void setGenesisBlockPath(String genesisBlockPath) { + this.genesisBlockPath = genesisBlockPath; + } + + public long getCachedBlockSizeLimit() { + return cachedBlockSizeLimit; + } + + public void setCachedBlockSizeLimit(long cachedBlockSizeLimit) { + this.cachedBlockSizeLimit = cachedBlockSizeLimit; + } + + public short getInterval() { + return interval; + } + + public void setInterval(short interval) { + this.interval = interval; + } + + public byte getEffectiveRatioMinimum() { + return effectiveRatioMinimum; + } + + public void setEffectiveRatioMinimum(byte effectiveRatioMinimum) { + this.effectiveRatioMinimum = effectiveRatioMinimum; + } + + public short getContinuousIntervalCountMinimum() { + return continuousIntervalCountMinimum; + } + + public void setContinuousIntervalCountMinimum(short continuousIntervalCountMinimum) { + this.continuousIntervalCountMinimum = continuousIntervalCountMinimum; + } + + public int getMinNodes() { + return minNodes; + } + + public void setMinNodes(int minNodes) { + this.minNodes = minNodes; + } + + public int getMaxOutAmount() { + return maxOutAmount; + } + + public void setMaxOutAmount(int maxOutAmount) { + this.maxOutAmount = maxOutAmount; + } + + public int getMaxInAmount() { + return maxInAmount; + } + + public void setMaxInAmount(int maxInAmount) { + this.maxInAmount = maxInAmount; + } + + public int getSendHeight() { + return sendHeight; + } + + public void setSendHeight(int sendHeight) { + this.sendHeight = sendHeight; + } + + public int getByzantineRatio() { + return byzantineRatio; + } + + public void setByzantineRatio(int byzantineRatio) { + this.byzantineRatio = byzantineRatio; + } + + public int getMinSignature() { + return minSignature; + } + + public void setMinSignature(int minSignature) { + this.minSignature = minSignature; + } + + public String getVerifiers() { + return verifiers; + } + + public void setVerifiers(String verifiers) { + this.verifiers = verifiers; + } + + public int getMainByzantineRatio() { + return mainByzantineRatio; + } + + public void setMainByzantineRatio(int mainByzantineRatio) { + this.mainByzantineRatio = mainByzantineRatio; + } + + public int getMaxSignatureCount() { + return maxSignatureCount; + } + + public void setMaxSignatureCount(int maxSignatureCount) { + this.maxSignatureCount = maxSignatureCount; + } + + public Set getVerifierSet() { + return verifierSet; + } + + public void setVerifierSet(Set verifierSet) { + this.verifierSet = verifierSet; + } + + public long getPackingInterval() { + return packingInterval; + } + + public void setPackingInterval(long packingInterval) { + this.packingInterval = packingInterval; + } + + public long getRedPublishLockTime() { + return redPublishLockTime; + } + + public void setRedPublishLockTime(long redPublishLockTime) { + this.redPublishLockTime = redPublishLockTime; + } + + public long getStopAgentLockTime() { + return stopAgentLockTime; + } + + public void setStopAgentLockTime(long stopAgentLockTime) { + this.stopAgentLockTime = stopAgentLockTime; + } + + public byte getCommissionRateMin() { + return commissionRateMin; + } + + public void setCommissionRateMin(byte commissionRateMin) { + this.commissionRateMin = commissionRateMin; + } + + public byte getCommissionRateMax() { + return commissionRateMax; + } + + public void setCommissionRateMax(byte commissionRateMax) { + this.commissionRateMax = commissionRateMax; + } + + public BigInteger getDepositMin() { + return depositMin; + } + + public void setDepositMin(BigInteger depositMin) { + this.depositMin = depositMin; + } + + public BigInteger getDepositMax() { + return depositMax; + } + + public void setDepositMax(BigInteger depositMax) { + this.depositMax = depositMax; + } + + public BigInteger getCommissionMin() { + return commissionMin; + } + + public void setCommissionMin(BigInteger commissionMin) { + this.commissionMin = commissionMin; + } + + public BigInteger getCommissionMax() { + return commissionMax; + } + + public void setCommissionMax(BigInteger commissionMax) { + this.commissionMax = commissionMax; + } + + public BigInteger getEntrusterDepositMin() { + return entrusterDepositMin; + } + + public void setEntrusterDepositMin(BigInteger entrusterDepositMin) { + this.entrusterDepositMin = entrusterDepositMin; + } + + public String getSeedNodes() { + return seedNodes; + } + + public void setSeedNodes(String seedNodes) { + this.seedNodes = seedNodes; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public BigInteger getBlockReward() { + return blockReward; + } + + public void setBlockReward(BigInteger blockReward) { + this.blockReward = blockReward; + } + + public int getAgentAssetId() { + return agentAssetId; + } + + public void setAgentAssetId(int agentAssetId) { + this.agentAssetId = agentAssetId; + } + + public int getAgentChainId() { + return agentChainId; + } + + public void setAgentChainId(int agentChainId) { + this.agentChainId = agentChainId; + } + + public int getAwardAssetId() { + return awardAssetId; + } + + public void setAwardAssetId(int awardAssetId) { + this.awardAssetId = awardAssetId; + } + + public long getFeeUnit() { + return feeUnit; + } + + public void setFeeUnit(long feeUnit) { + this.feeUnit = feeUnit; + } + + public BigInteger getTotalInflationAmount() { + return totalInflationAmount; + } + + public void setTotalInflationAmount(BigInteger totalInflationAmount) { + this.totalInflationAmount = totalInflationAmount; + } + + public BigInteger getInflationAmount() { + return inflationAmount; + } + + public void setInflationAmount(BigInteger inflationAmount) { + this.inflationAmount = inflationAmount; + } + + public long getInitTime() { + return initTime; + } + + public void setInitTime(long initTime) { + this.initTime = initTime; + } + + public double getDeflationRatio() { + return deflationRatio; + } + + public void setDeflationRatio(double deflationRatio) { + this.deflationRatio = deflationRatio; + } + + public long getDeflationTimeInterval() { + return deflationTimeInterval; + } + + public void setDeflationTimeInterval(long deflationTimeInterval) { + this.deflationTimeInterval = deflationTimeInterval; + } + + public long getMaxViewGas() { + return maxViewGas; + } + + public void setMaxViewGas(long maxViewGas) { + this.maxViewGas = maxViewGas; + } + + public long getTxMaxSize() { + return txMaxSize; + } + + public void setTxMaxSize(long txMaxSize) { + this.txMaxSize = txMaxSize; + } + + public int getModuleVerifyPercent() { + return moduleVerifyPercent; + } + + public void setModuleVerifyPercent(int moduleVerifyPercent) { + this.moduleVerifyPercent = moduleVerifyPercent; + } + + public int getPackageRpcReserveTime() { + return packageRpcReserveTime; + } + + public void setPackageRpcReserveTime(int packageRpcReserveTime) { + this.packageRpcReserveTime = packageRpcReserveTime; + } + + public long getTxUnverifiedQueueSize() { + return txUnverifiedQueueSize; + } + + public void setTxUnverifiedQueueSize(long txUnverifiedQueueSize) { + this.txUnverifiedQueueSize = txUnverifiedQueueSize; + } + + public int getOrphanTtl() { + return orphanTtl; + } + + public void setOrphanTtl(int orphanTtl) { + this.orphanTtl = orphanTtl; + } +} diff --git a/module/nuls-cores/src/main/java/io/nuls/common/ConfigManager.java b/module/nuls-cores/src/main/java/io/nuls/common/ConfigManager.java new file mode 100644 index 0000000000..7fc43a19ce --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/common/ConfigManager.java @@ -0,0 +1,132 @@ +/* + * MIT License + * + * Copyright (c) 2017-2019 nuls.io + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ +package io.nuls.common; + +import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.base.protocol.ProtocolLoader; +import io.nuls.base.protocol.RegisterHelper; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.crosschain.constant.NulsCrossChainConstant; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import static io.nuls.transaction.utils.LoggerUtil.LOG; + +/** + * 链管理类,负责各条链的初始化,运行,启动,参数维护等 + * Chain management class, responsible for the initialization, operation, start-up, parameter maintenance of each chain, etc. + * + */ +@Component +public class ConfigManager { + + @Autowired + private NulsCoresConfig config; + + /** + * 初始化并启动链 + * Initialize and start the chain + */ + public void init() throws Exception { + Map configMap = configChain(); + if (configMap == null || configMap.size() == 0) { + return; + } + CommonContext.CONFIG_BEAN_MAP.clear(); + CommonContext.CONFIG_BEAN_MAP.putAll(configMap); + } + + public void registerProtocol() throws Exception { + Map configMap = CommonContext.CONFIG_BEAN_MAP; + if (configMap == null || configMap.size() == 0) { + return; + } + for (Map.Entry entry : configMap.entrySet()) { + int chainId = entry.getKey(); + ProtocolLoader.load(chainId); + /*注册交易处理器*/ + boolean regSuccess = RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); + if (!regSuccess) { + LOG.error("RegisterHelper.registerTx fail.."); + System.exit(-1); + } + LOG.info("regTxRpc complete....."); + //注册相关交易 + regSuccess = RegisterHelper.registerProtocol(chainId); + if (!regSuccess) { + LOG.error("RegisterHelper.registerProtocol fail.."); + System.exit(-1); + } + LOG.info("register protocol ..."); + RegisterHelper.registerMsg(ProtocolGroupManager.getOneProtocol()); + LOG.info("register msg ..."); + } + } + + /** + * 读取配置文件创建并初始化链 + * Read the configuration file to create and initialize the chain + */ + private Map configChain() { + try { + /* + 读取数据库链信息配置 + Read database chain information configuration + */ + //Map configMap = configService.getList();// 取消持久化config + Map configMap = new HashMap<>(); + + /* + 如果系统是第一次运行，则本地数据库没有存储链信息，此时需要从配置文件读取主链配置信息 + If the system is running for the first time, the local database does not have chain information, + and the main chain configuration information needs to be read from the configuration file at this time. + */ + if (configMap.isEmpty()) { + ConfigBean configBean = config; + if(config.getVerifiers() != null){ + configBean.setVerifierSet(new HashSet<>(Arrays.asList(config.getVerifiers().split(NulsCrossChainConstant.VERIFIER_SPLIT)))); + }else{ + configBean.setVerifierSet(new HashSet<>()); + } + + // 取消持久化config + //boolean saveSuccess = configService.save(configBean, configBean.getChainId()); + //if(saveSuccess){ + // configMap.put(configBean.getChainId(), configBean); + //} + configMap.put(configBean.getChainId(), configBean); + } + return configMap; + } catch (Exception e) { + LOG.error(e); + return null; + } + } + +} diff --git a/module/nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigBean.java b/module/nuls-cores/src/main/java/io/nuls/common/INulsCoresBootstrap.java similarity index 56% rename from module/nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigBean.java rename to module/nuls-cores/src/main/java/io/nuls/common/INulsCoresBootstrap.java index a3e0cd736d..4c993c7582 100644 --- a/module/nuls-account/src/main/java/io/nuls/account/model/bo/config/ConfigBean.java +++ b/module/nuls-cores/src/main/java/io/nuls/common/INulsCoresBootstrap.java @@ -1,18 +1,18 @@ -/* +/** * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * + *

+ * Copyright (c) 2017-2018 nuls.io + *

* Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + *

* The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - * + *

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,52 +20,20 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * */ -package io.nuls.account.model.bo.config; -import java.io.Serializable; +package io.nuls.common; + +import io.nuls.core.rpc.modulebootstrap.Module; /** - * 账户模块配置类 - * Account Module Configuration Class - * - * @author qinyifeng - * @date 2018/11/11 + * @author: PierreLuo + * @date: 2023/6/25 */ -public class ConfigBean implements Serializable { - /** - * 资产ID - * assets id - */ - private int assetId; - - /** - * chain id - */ - private int chainId; - - public ConfigBean() { - } - - public ConfigBean(int assetId, int chainId) { - this.assetId = assetId; - this.chainId = chainId; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public int getChainId() { - return chainId; - } +public interface INulsCoresBootstrap { - public void setChainId(int chainId) { - this.chainId = chainId; - } + int order(); + Module moduleInfo(); + void mainFunction(String[] args); + void onDependenciesReady(); } diff --git a/module/nuls-cores/src/main/java/io/nuls/common/NulsCoresConfig.java b/module/nuls-cores/src/main/java/io/nuls/common/NulsCoresConfig.java new file mode 100644 index 0000000000..be5dd00319 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/common/NulsCoresConfig.java @@ -0,0 +1,858 @@ +package io.nuls.common; + +import io.nuls.core.basic.ModuleConfig; +import io.nuls.core.basic.VersionChangeInvoker; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.core.annotation.Configuration; +import io.nuls.core.rpc.model.ModuleE; + +import java.lang.reflect.InvocationTargetException; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * @author: PierreLuo + * @date: 2023/7/27 + */ +@Component +@Configuration(domain = ModuleE.Constant.NULS_CORES) +public class NulsCoresConfig extends ConfigBean implements ModuleConfig { + + /*-------------------------[Common]-----------------------------*/ + + private String dataPath; + + /** 模块code*/ + private String moduleCode; + + /** 主链链ID*/ + private int mainChainId; + + /** 主链主资产ID*/ + private int mainAssetId; + + /** 语言*/ + private String language; + + /** 编码*/ + private String encoding; + private String blackHolePublicKey; + + /** + * 链ID + */ + private int chainId; + private int assetId; + private int decimals = 8; + private String symbol; + private String addressPrefix; + private String logLevel = "DEBUG"; + + /*-------------------------[Transaction]-----------------------------*/ + /** 未确认交易过期时间秒 */ + private long unconfirmedTxExpire; + + + private String blackListPath; + private String accountBlockManagerPublicKeys; + /** + * 是否已连接智能合约模块 + */ + private volatile boolean collectedSmartContractModule; + + /*-------------------------[Protocol]-----------------------------*/ + + /*-------------------------[Network]-----------------------------*/ + + private int port; + + private long packetMagic; + + private int maxInCount; + + private int maxOutCount; + + private int maxInSameIp; + private String selfSeedIps; + private List seedIpList; + + private int crossPort; + + private int crossMaxInCount; + + private int crossMaxOutCount; + + private int crossMaxInSameIp; + private String moonSeedIps; + private List moonSeedIpList; + + private boolean moonNode; + + private List localIps = new ArrayList<>(); + private int updatePeerInfoType = 0; + /** + * 中心化网络服务接口 + */ + private String timeServers; + + /*-------------------------[Ledger]-----------------------------*/ + private int unconfirmedTxExpired; + private int assetRegDestroyAmount = 200; + + /*-------------------------[CrossChain]-----------------------------*/ + + private int crossCtxType; + + private boolean mainNet; + + /**默认链接到的跨链节点*/ + private String crossSeedIps; + + /** + * 种子节点列表 + */ + private Set seedNodeList; + /*-------------------------[Block]-----------------------------*/ + + /** + * 分叉链监视线程执行间隔 + */ + private int forkChainsMonitorInterval; + + /** + * 孤儿链监视线程执行间隔 + */ + private int orphanChainsMonitorInterval; + + /** + * 孤儿链维护线程执行间隔 + */ + private int orphanChainsMaintainerInterval; + + /** + * 数据库监视线程执行间隔 + */ + private int storageSizeMonitorInterval; + + /** + * 网络监视线程执行间隔 + */ + private int networkResetMonitorInterval; + + /** + * 节点数量监控线程执行间隔 + */ + private int nodesMonitorInterval; + + /** + * TxGroup请求器线程执行间隔 + */ + private int txGroupRequestorInterval; + + /** + * TxGroup请求器任务执行延时 + */ + private int txGroupTaskDelay; + + /** + * 启动后自动回滚多少个区块 + */ + private int testAutoRollbackAmount; + + /** + * 回滚到指定高度 + */ + private int rollbackHeight; + /*-------------------------[Account]-----------------------------*/ + /** + * key store 存储文件夹 + */ + private String keystoreFolder; + + private String blockAccountManager; + + /*-------------------------[Consensus]-----------------------------*/ + + + /** + * 跨链交易手续费主链收取手续费比例 + * Cross-Chain Transaction Fee Proportion of Main Chain Fee Collection + * */ + private int mainChainCommissionRatio; + + /*-------------------------[SmartContract]-----------------------------*/ + + private long maxViewGas; + + private String packageLogPackages; + + private String packageLogLevels; + + private String crossTokenSystemContract; + + /*-------------------------[Chain Manager]-----------------------------*/ + /** + * 初始配置参数 + */ + private String chainNameMax; + private String assetSymbolMax; + private String assetNameMax; + private BigInteger assetDepositNuls; + private BigInteger assetDestroyNuls; + private String assetDepositNulsDestroyRate; + private String assetDepositNulsLockRate; + + private String assetInitNumberMin; + private String assetInitNumberMax; + private String assetDecimalPlacesMin; + private String assetDecimalPlacesMax; + private String assetRecoveryRate; + + private String chainName; + private String nulsAssetInitNumberMax; + private String mainSymbol; + private String nulsFeeMainNetRate = "0.6"; + private int nulsFeeMainNetPercent = 60; + private int nulsFeeOtherNetPercent = 40; + private String defaultDecimalPlaces = "8"; + + private int chainAssetsTaskIntervalMinute; + /*----------------------------------------------------------------------*/ + + public boolean isCollectedSmartContractModule() { + return collectedSmartContractModule; + } + + public void setCollectedSmartContractModule(boolean collectedSmartContractModule) { + this.collectedSmartContractModule = collectedSmartContractModule; + } + + public List getLocalIps() { + + return localIps; + } + + public String getLogLevel() { + return logLevel; + } + + public void setLogLevel(String logLevel) { + this.logLevel = logLevel; + } + + public String getExternalIp() { + if (localIps.size() > 0) { + return localIps.get(localIps.size() - 1); + } + return null; + } + + public String getDataPath() { + return dataPath; + } + + public void setDataPath(String dataPath) { + this.dataPath = dataPath; + } + + public String getModuleCode() { + return moduleCode; + } + + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + } + + public int getMainChainId() { + return mainChainId; + } + + public void setMainChainId(int mainChainId) { + this.mainChainId = mainChainId; + } + + public int getMainAssetId() { + return mainAssetId; + } + + public void setMainAssetId(int mainAssetId) { + this.mainAssetId = mainAssetId; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public String getEncoding() { + return encoding; + } + + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + public String getBlackHolePublicKey() { + return blackHolePublicKey; + } + + public void setBlackHolePublicKey(String blackHolePublicKey) { + this.blackHolePublicKey = blackHolePublicKey; + } + + @Override + public int getChainId() { + return chainId; + } + + @Override + public void setChainId(int chainId) { + this.chainId = chainId; + } + + @Override + public int getAssetId() { + return assetId; + } + + @Override + public void setAssetId(int assetId) { + this.assetId = assetId; + } + + public int getDecimals() { + return decimals; + } + + public void setDecimals(int decimals) { + this.decimals = decimals; + } + + public String getSymbol() { + return symbol; + } + + public void setSymbol(String symbol) { + this.symbol = symbol; + } + + public String getAddressPrefix() { + return addressPrefix; + } + + public void setAddressPrefix(String addressPrefix) { + this.addressPrefix = addressPrefix; + } + + public long getUnconfirmedTxExpire() { + return unconfirmedTxExpire; + } + + public void setUnconfirmedTxExpire(long unconfirmedTxExpire) { + this.unconfirmedTxExpire = unconfirmedTxExpire; + } + + public String getBlackListPath() { + return blackListPath; + } + + public void setBlackListPath(String blackListPath) { + this.blackListPath = blackListPath; + } + + public String getAccountBlockManagerPublicKeys() { + return accountBlockManagerPublicKeys; + } + + public void setAccountBlockManagerPublicKeys(String accountBlockManagerPublicKeys) { + this.accountBlockManagerPublicKeys = accountBlockManagerPublicKeys; + } + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } + + public long getPacketMagic() { + return packetMagic; + } + + public void setPacketMagic(long packetMagic) { + this.packetMagic = packetMagic; + } + + public int getMaxInCount() { + return maxInCount; + } + + public void setMaxInCount(int maxInCount) { + this.maxInCount = maxInCount; + } + + public int getMaxOutCount() { + return maxOutCount; + } + + public void setMaxOutCount(int maxOutCount) { + this.maxOutCount = maxOutCount; + } + + public int getMaxInSameIp() { + return maxInSameIp; + } + + public void setMaxInSameIp(int maxInSameIp) { + this.maxInSameIp = maxInSameIp; + } + + public String getSelfSeedIps() { + return selfSeedIps; + } + + public void setSelfSeedIps(String selfSeedIps) { + this.selfSeedIps = selfSeedIps; + } + + public List getSeedIpList() { + return seedIpList; + } + + public void setSeedIpList(List seedIpList) { + this.seedIpList = seedIpList; + } + + public int getCrossPort() { + return crossPort; + } + + public void setCrossPort(int crossPort) { + this.crossPort = crossPort; + } + + public int getCrossMaxInCount() { + return crossMaxInCount; + } + + public void setCrossMaxInCount(int crossMaxInCount) { + this.crossMaxInCount = crossMaxInCount; + } + + public int getCrossMaxOutCount() { + return crossMaxOutCount; + } + + public void setCrossMaxOutCount(int crossMaxOutCount) { + this.crossMaxOutCount = crossMaxOutCount; + } + + public int getCrossMaxInSameIp() { + return crossMaxInSameIp; + } + + public void setCrossMaxInSameIp(int crossMaxInSameIp) { + this.crossMaxInSameIp = crossMaxInSameIp; + } + + public String getMoonSeedIps() { + return moonSeedIps; + } + + public void setMoonSeedIps(String moonSeedIps) { + this.moonSeedIps = moonSeedIps; + } + + public List getMoonSeedIpList() { + return moonSeedIpList; + } + + public void setMoonSeedIpList(List moonSeedIpList) { + this.moonSeedIpList = moonSeedIpList; + } + + public boolean isMoonNode() { + return moonNode; + } + + public void setMoonNode(boolean moonNode) { + this.moonNode = moonNode; + } + + public void setLocalIps(List localIps) { + this.localIps = localIps; + } + + public int getUpdatePeerInfoType() { + return updatePeerInfoType; + } + + public void setUpdatePeerInfoType(int updatePeerInfoType) { + this.updatePeerInfoType = updatePeerInfoType; + } + + public String getTimeServers() { + return timeServers; + } + + public void setTimeServers(String timeServers) { + this.timeServers = timeServers; + } + + public int getUnconfirmedTxExpired() { + return unconfirmedTxExpired; + } + + public void setUnconfirmedTxExpired(int unconfirmedTxExpired) { + this.unconfirmedTxExpired = unconfirmedTxExpired; + } + + public int getAssetRegDestroyAmount() { + return assetRegDestroyAmount; + } + + public void setAssetRegDestroyAmount(int assetRegDestroyAmount) { + this.assetRegDestroyAmount = assetRegDestroyAmount; + } + + public int getCrossCtxType() { + return crossCtxType; + } + + public void setCrossCtxType(int crossCtxType) { + this.crossCtxType = crossCtxType; + } + + public boolean isMainNet() { + return mainNet; + } + + public void setMainNet(boolean mainNet) { + this.mainNet = mainNet; + } + + public String getCrossSeedIps() { + return crossSeedIps; + } + + public void setCrossSeedIps(String crossSeedIps) { + this.crossSeedIps = crossSeedIps; + } + + public Set getSeedNodeList() { + return seedNodeList; + } + + public void setSeedNodeList(Set seedNodeList) { + this.seedNodeList = seedNodeList; + } + + public int getForkChainsMonitorInterval() { + return forkChainsMonitorInterval; + } + + public void setForkChainsMonitorInterval(int forkChainsMonitorInterval) { + this.forkChainsMonitorInterval = forkChainsMonitorInterval; + } + + public int getOrphanChainsMonitorInterval() { + return orphanChainsMonitorInterval; + } + + public void setOrphanChainsMonitorInterval(int orphanChainsMonitorInterval) { + this.orphanChainsMonitorInterval = orphanChainsMonitorInterval; + } + + public int getOrphanChainsMaintainerInterval() { + return orphanChainsMaintainerInterval; + } + + public void setOrphanChainsMaintainerInterval(int orphanChainsMaintainerInterval) { + this.orphanChainsMaintainerInterval = orphanChainsMaintainerInterval; + } + + public int getStorageSizeMonitorInterval() { + return storageSizeMonitorInterval; + } + + public void setStorageSizeMonitorInterval(int storageSizeMonitorInterval) { + this.storageSizeMonitorInterval = storageSizeMonitorInterval; + } + + public int getNetworkResetMonitorInterval() { + return networkResetMonitorInterval; + } + + public void setNetworkResetMonitorInterval(int networkResetMonitorInterval) { + this.networkResetMonitorInterval = networkResetMonitorInterval; + } + + public int getNodesMonitorInterval() { + return nodesMonitorInterval; + } + + public void setNodesMonitorInterval(int nodesMonitorInterval) { + this.nodesMonitorInterval = nodesMonitorInterval; + } + + public int getTxGroupRequestorInterval() { + return txGroupRequestorInterval; + } + + public void setTxGroupRequestorInterval(int txGroupRequestorInterval) { + this.txGroupRequestorInterval = txGroupRequestorInterval; + } + + public int getTxGroupTaskDelay() { + return txGroupTaskDelay; + } + + public void setTxGroupTaskDelay(int txGroupTaskDelay) { + this.txGroupTaskDelay = txGroupTaskDelay; + } + + public int getTestAutoRollbackAmount() { + return testAutoRollbackAmount; + } + + public void setTestAutoRollbackAmount(int testAutoRollbackAmount) { + this.testAutoRollbackAmount = testAutoRollbackAmount; + } + + public int getRollbackHeight() { + return rollbackHeight; + } + + public void setRollbackHeight(int rollbackHeight) { + this.rollbackHeight = rollbackHeight; + } + + public String getKeystoreFolder() { + return keystoreFolder; + } + + public void setKeystoreFolder(String keystoreFolder) { + this.keystoreFolder = keystoreFolder; + } + + public String getBlockAccountManager() { + return blockAccountManager; + } + + public void setBlockAccountManager(String blockAccountManager) { + this.blockAccountManager = blockAccountManager; + } + + public int getMainChainCommissionRatio() { + return mainChainCommissionRatio; + } + + public void setMainChainCommissionRatio(int mainChainCommissionRatio) { + this.mainChainCommissionRatio = mainChainCommissionRatio; + } + + @Override + public long getMaxViewGas() { + return maxViewGas; + } + + @Override + public void setMaxViewGas(long maxViewGas) { + this.maxViewGas = maxViewGas; + } + + public String getPackageLogPackages() { + return packageLogPackages; + } + + public void setPackageLogPackages(String packageLogPackages) { + this.packageLogPackages = packageLogPackages; + } + + public String getPackageLogLevels() { + return packageLogLevels; + } + + public void setPackageLogLevels(String packageLogLevels) { + this.packageLogLevels = packageLogLevels; + } + + public String getCrossTokenSystemContract() { + return crossTokenSystemContract; + } + + public void setCrossTokenSystemContract(String crossTokenSystemContract) { + this.crossTokenSystemContract = crossTokenSystemContract; + } + + public String getChainNameMax() { + return chainNameMax; + } + + public void setChainNameMax(String chainNameMax) { + this.chainNameMax = chainNameMax; + } + + public String getAssetSymbolMax() { + return assetSymbolMax; + } + + public void setAssetSymbolMax(String assetSymbolMax) { + this.assetSymbolMax = assetSymbolMax; + } + + public String getAssetNameMax() { + return assetNameMax; + } + + public void setAssetNameMax(String assetNameMax) { + this.assetNameMax = assetNameMax; + } + + public BigInteger getAssetDepositNuls() { + return assetDepositNuls; + } + + public void setAssetDepositNuls(BigInteger assetDepositNuls) { + this.assetDepositNuls = assetDepositNuls; + } + + public BigInteger getAssetDestroyNuls() { + return assetDestroyNuls; + } + + public void setAssetDestroyNuls(BigInteger assetDestroyNuls) { + this.assetDestroyNuls = assetDestroyNuls; + } + + public String getAssetDepositNulsDestroyRate() { + return assetDepositNulsDestroyRate; + } + + public void setAssetDepositNulsDestroyRate(String assetDepositNulsDestroyRate) { + this.assetDepositNulsDestroyRate = assetDepositNulsDestroyRate; + } + + public String getAssetDepositNulsLockRate() { + return assetDepositNulsLockRate; + } + + public void setAssetDepositNulsLockRate(String assetDepositNulsLockRate) { + this.assetDepositNulsLockRate = assetDepositNulsLockRate; + } + + public String getAssetInitNumberMin() { + return assetInitNumberMin; + } + + public void setAssetInitNumberMin(String assetInitNumberMin) { + this.assetInitNumberMin = assetInitNumberMin; + } + + public String getAssetInitNumberMax() { + return assetInitNumberMax; + } + + public void setAssetInitNumberMax(String assetInitNumberMax) { + this.assetInitNumberMax = assetInitNumberMax; + } + + public String getAssetDecimalPlacesMin() { + return assetDecimalPlacesMin; + } + + public void setAssetDecimalPlacesMin(String assetDecimalPlacesMin) { + this.assetDecimalPlacesMin = assetDecimalPlacesMin; + } + + public String getAssetDecimalPlacesMax() { + return assetDecimalPlacesMax; + } + + public void setAssetDecimalPlacesMax(String assetDecimalPlacesMax) { + this.assetDecimalPlacesMax = assetDecimalPlacesMax; + } + + public String getAssetRecoveryRate() { + return assetRecoveryRate; + } + + public void setAssetRecoveryRate(String assetRecoveryRate) { + this.assetRecoveryRate = assetRecoveryRate; + } + + public String getChainName() { + return chainName; + } + + public void setChainName(String chainName) { + this.chainName = chainName; + } + + public String getNulsAssetInitNumberMax() { + return nulsAssetInitNumberMax; + } + + public void setNulsAssetInitNumberMax(String nulsAssetInitNumberMax) { + this.nulsAssetInitNumberMax = nulsAssetInitNumberMax; + } + + public String getMainSymbol() { + return mainSymbol; + } + + public void setMainSymbol(String mainSymbol) { + this.mainSymbol = mainSymbol; + } + + public String getNulsFeeMainNetRate() { + return nulsFeeMainNetRate; + } + + public void setNulsFeeMainNetRate(String nulsFeeMainNetRate) { + this.nulsFeeMainNetRate = nulsFeeMainNetRate; + } + + public int getNulsFeeMainNetPercent() { + return nulsFeeMainNetPercent; + } + + public void setNulsFeeMainNetPercent(int nulsFeeMainNetPercent) { + this.nulsFeeMainNetPercent = nulsFeeMainNetPercent; + } + + public int getNulsFeeOtherNetPercent() { + return nulsFeeOtherNetPercent; + } + + public void setNulsFeeOtherNetPercent(int nulsFeeOtherNetPercent) { + this.nulsFeeOtherNetPercent = nulsFeeOtherNetPercent; + } + + public String getDefaultDecimalPlaces() { + return defaultDecimalPlaces; + } + + public void setDefaultDecimalPlaces(String defaultDecimalPlaces) { + this.defaultDecimalPlaces = defaultDecimalPlaces; + } + + public int getChainAssetsTaskIntervalMinute() { + return chainAssetsTaskIntervalMinute; + } + + public void setChainAssetsTaskIntervalMinute(int chainAssetsTaskIntervalMinute) { + this.chainAssetsTaskIntervalMinute = chainAssetsTaskIntervalMinute; + } + + @Override + public VersionChangeInvoker getVersionChangeInvoker() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { + return CommonVersionChangeInvoker.instance(); + } +} diff --git a/module/nuls-cores/src/main/java/io/nuls/consensus/ConsensusBootStrap.java b/module/nuls-cores/src/main/java/io/nuls/consensus/ConsensusBootStrap.java new file mode 100644 index 0000000000..e32a09bf87 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/ConsensusBootStrap.java @@ -0,0 +1,114 @@ +package io.nuls.consensus; + +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.enumeration.ConsensusStatus; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.log.Log; +import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.modulebootstrap.Module; +import io.nuls.core.rpc.util.AddressPrefixDatas; + +import java.io.File; +import java.lang.reflect.Field; +import java.nio.charset.Charset; + +import static java.nio.charset.StandardCharsets.UTF_8; + +/** + * 共识模块启动及初始化管理 + * Consensus Module Startup and Initialization Management + * + * @author tag + * 2018/3/4 + */ +@Component +public class ConsensusBootStrap implements INulsCoresBootstrap { + + @Autowired + private NulsCoresConfig consensusConfig; + @Autowired + private ChainManager chainManager; + @Autowired + private AddressPrefixDatas addressPrefixDatas; + + @Override + public int order() { + return 4; + } + + @Override + public void mainFunction(String[] args) { + this.init(); + } + + public void init() { + try { + initSys(); + initDB(); + chainManager.initChain(); + } catch (Exception e) { + Log.error(e); + } + } + + + @Override + public Module moduleInfo() { + return new Module(ModuleE.CS.abbr, ConsensusConstant.RPC_VERSION); + } + + private boolean doStart() { + try { + chainManager.runChain(); + return true; + } catch (Exception e) { + Log.error(e); + return false; + } + } + + public void onDependenciesReady() { + try { + doStart(); + //智能合约交易注册 + chainManager.registerContractTx(); + for (Chain chain : chainManager.getChainMap().values()) { + CallMethodUtils.sendState(chain, chain.isPacker()); + chain.setConsensusStatus(ConsensusStatus.RUNNING); + } + Log.debug("cs onDependenciesReady"); + } catch (Exception e) { + Log.error(e); + } + } + + /** + * 初始化系统编码 + * Initialization System Coding + */ + private void initSys() throws Exception { + System.setProperty(ConsensusConstant.SYS_FILE_ENCODING, UTF_8.name()); + Field charset = Charset.class.getDeclaredField("defaultCharset"); + charset.setAccessible(true); + charset.set(null, UTF_8); + } + + /** + * 初始化数据库 + * Initialization database + */ + private void initDB() throws Exception { + RocksDBService.init(consensusConfig.getDataPath() + File.separator + ModuleE.CS.name); + RocksDBService.createTable(ConsensusConstant.DB_NAME_CONSUME_CONGIF); + if (consensusConfig.getMainChainId() != 1) { + return; + } + } +} \ No newline at end of file diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConstant.java b/module/nuls-cores/src/main/java/io/nuls/consensus/constant/ConsensusConstant.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConstant.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/constant/ConsensusConstant.java index f5d11b3e4d..26ddd4d2f4 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusConstant.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/constant/ConsensusConstant.java @@ -1,4 +1,4 @@ -package io.nuls.poc.constant; +package io.nuls.consensus.constant; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/consensus/constant/ConsensusErrorCode.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/constant/ConsensusErrorCode.java index c13f6644a1..930e8d913f 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/constant/ConsensusErrorCode.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/constant/ConsensusErrorCode.java @@ -1,4 +1,4 @@ -package io.nuls.poc.constant; +package io.nuls.consensus.constant; import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.constant.ErrorCode; diff --git a/module/nuls-consensus/economic-model/base-economic/src/main/java/io/nuls/economic/base/service/EconomicService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/base/service/EconomicService.java similarity index 91% rename from module/nuls-consensus/economic-model/base-economic/src/main/java/io/nuls/economic/base/service/EconomicService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/base/service/EconomicService.java index 950d43da03..635df8b1bf 100644 --- a/module/nuls-consensus/economic-model/base-economic/src/main/java/io/nuls/economic/base/service/EconomicService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/base/service/EconomicService.java @@ -1,4 +1,4 @@ -package io.nuls.economic.base.service; +package io.nuls.consensus.economic.base.service; import io.nuls.core.basic.Result; diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/constant/NulsEconomicConstant.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/constant/NulsEconomicConstant.java similarity index 92% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/constant/NulsEconomicConstant.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/constant/NulsEconomicConstant.java index 759320a078..8c7e3b19ed 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/constant/NulsEconomicConstant.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/constant/NulsEconomicConstant.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.constant; +package io.nuls.consensus.economic.nuls.constant; /** * 经济模型模块常量类 diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/constant/ParamConstant.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/constant/ParamConstant.java similarity index 89% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/constant/ParamConstant.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/constant/ParamConstant.java index f2db0e0bd6..824c141a39 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/constant/ParamConstant.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/constant/ParamConstant.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.constant; +package io.nuls.consensus.economic.nuls.constant; /** * 跨链模块参数常量管理类 diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/AgentInfo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/AgentInfo.java similarity index 97% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/AgentInfo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/AgentInfo.java index 5d84d5a6c0..6d4d2709d5 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/AgentInfo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/AgentInfo.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.model.bo; +package io.nuls.consensus.economic.nuls.model.bo; import java.math.BigInteger; import java.util.List; diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/ConsensusConfigInfo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/ConsensusConfigInfo.java similarity index 98% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/ConsensusConfigInfo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/ConsensusConfigInfo.java index 18a2bb4cad..7fc30a4864 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/ConsensusConfigInfo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/ConsensusConfigInfo.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.model.bo; +package io.nuls.consensus.economic.nuls.model.bo; import java.math.BigInteger; /** diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/DepositInfo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/DepositInfo.java similarity index 92% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/DepositInfo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/DepositInfo.java index 5c3fa92f55..41dfad1794 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/DepositInfo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/DepositInfo.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.model.bo; +package io.nuls.consensus.economic.nuls.model.bo; import java.math.BigInteger; /** diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/InflationInfo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/InflationInfo.java similarity index 95% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/InflationInfo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/InflationInfo.java index 76edf7889d..6865496748 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/InflationInfo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/InflationInfo.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.model.bo; +package io.nuls.consensus.economic.nuls.model.bo; import java.math.BigDecimal; /** diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/RoundInfo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/RoundInfo.java similarity index 96% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/RoundInfo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/RoundInfo.java index e96123a19b..40e9b6b42e 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/model/bo/RoundInfo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/model/bo/RoundInfo.java @@ -1,4 +1,4 @@ -package io.nuls.economic.nuls.model.bo; +package io.nuls.consensus.economic.nuls.model.bo; /** * 轮次相关信息 * Round related information diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/service/EconomicServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/service/EconomicServiceImpl.java similarity index 82% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/service/EconomicServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/service/EconomicServiceImpl.java index c973fecf5c..15312ab8c5 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/service/EconomicServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/service/EconomicServiceImpl.java @@ -1,16 +1,16 @@ -package io.nuls.economic.nuls.service; +package io.nuls.consensus.economic.nuls.service; import io.nuls.base.data.CoinTo; +import io.nuls.consensus.economic.nuls.constant.NulsEconomicConstant; +import io.nuls.consensus.economic.nuls.constant.ParamConstant; +import io.nuls.consensus.economic.nuls.model.bo.AgentInfo; +import io.nuls.consensus.economic.nuls.model.bo.RoundInfo; +import io.nuls.consensus.economic.nuls.util.manager.EconomicManager; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.economic.base.service.EconomicService; -import io.nuls.economic.nuls.constant.NulsEconomicConstant; -import io.nuls.economic.nuls.constant.ParamConstant; -import io.nuls.economic.nuls.model.bo.AgentInfo; -import io.nuls.economic.nuls.model.bo.ConsensusConfigInfo; -import io.nuls.economic.nuls.model.bo.RoundInfo; -import io.nuls.economic.nuls.util.manager.EconomicManager; +import io.nuls.consensus.economic.base.service.EconomicService; +import io.nuls.consensus.economic.nuls.model.bo.ConsensusConfigInfo; import java.math.BigInteger; import java.util.HashMap; diff --git a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/util/manager/EconomicManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/util/manager/EconomicManager.java similarity index 98% rename from module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/util/manager/EconomicManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/util/manager/EconomicManager.java index 1690557bf4..c3a6304673 100644 --- a/module/nuls-consensus/economic-model/nuls-economic/src/main/java/io/nuls/economic/nuls/util/manager/EconomicManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/economic/nuls/util/manager/EconomicManager.java @@ -1,21 +1,23 @@ -package io.nuls.economic.nuls.util.manager; +package io.nuls.consensus.economic.nuls.util.manager; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.CoinTo; -import io.nuls.core.constant.CommonCodeConstanst; +import io.nuls.consensus.economic.nuls.constant.NulsEconomicConstant; +import io.nuls.consensus.economic.nuls.model.bo.*; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; import io.nuls.core.model.ArraysTool; import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.DoubleUtils; -import io.nuls.economic.nuls.constant.NulsEconomicConstant; -import io.nuls.economic.nuls.model.bo.*; import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 经济模型管理类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/BlockData.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/BlockData.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/BlockData.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/BlockData.java index 3ada83973f..5d78bde8bf 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/BlockData.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/BlockData.java @@ -23,7 +23,7 @@ * * SOFTWARE. * */ -package io.nuls.poc.model.bo; +package io.nuls.consensus.model.bo; import io.nuls.base.data.BlockExtendsData; import io.nuls.base.data.NulsHash; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/Chain.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/Chain.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/Chain.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/Chain.java index 29aabf177c..66d7f5efb1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/Chain.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/Chain.java @@ -1,18 +1,16 @@ -package io.nuls.poc.model.bo; +package io.nuls.consensus.model.bo; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; -import io.nuls.core.log.Log; -import io.nuls.core.parse.I18nUtils; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.bo.consensus.Evidence; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.utils.enumeration.ConsensusStatus; +import io.nuls.common.ConfigBean; +import io.nuls.consensus.model.bo.consensus.Evidence; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.utils.enumeration.ConsensusStatus; import io.nuls.core.log.logback.NulsLogger; import java.math.BigInteger; @@ -20,7 +18,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.logging.Logger; /** * 链信息类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/ChargeResultData.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/ChargeResultData.java similarity index 91% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/ChargeResultData.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/ChargeResultData.java index d935a8109a..f8927d0cc2 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/ChargeResultData.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/ChargeResultData.java @@ -1,6 +1,6 @@ -package io.nuls.poc.model.bo; +package io.nuls.consensus.model.bo; -import io.nuls.poc.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusConstant; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/consensus/Evidence.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/consensus/Evidence.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/consensus/Evidence.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/consensus/Evidence.java index d606b020c5..99a00a8433 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/consensus/Evidence.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/consensus/Evidence.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -package io.nuls.poc.model.bo.consensus; +package io.nuls.consensus.model.bo.consensus; import io.nuls.base.data.BlockHeader; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/MeetingMember.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/MeetingMember.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/MeetingMember.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/MeetingMember.java index 02085169da..1529f39a2f 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/MeetingMember.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/MeetingMember.java @@ -23,12 +23,12 @@ * * SOFTWARE. * */ -package io.nuls.poc.model.bo.round; +package io.nuls.consensus.model.bo.round; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; import io.nuls.core.rpc.model.TypeDescriptor; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; import io.nuls.core.crypto.Sha256Hash; import io.nuls.core.model.ByteUtils; import io.nuls.core.parse.SerializeUtils; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/MeetingRound.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/MeetingRound.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/MeetingRound.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/MeetingRound.java index 4af249041f..0a91895175 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/MeetingRound.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/MeetingRound.java @@ -23,7 +23,7 @@ * * SOFTWARE. * */ -package io.nuls.poc.model.bo.round; +package io.nuls.consensus.model.bo.round; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.Address; @@ -31,9 +31,9 @@ import io.nuls.core.rpc.model.ApiModelProperty; import io.nuls.core.rpc.model.TypeDescriptor; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.rpc.call.CallMethodUtils; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.rpc.call.CallMethodUtils; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.log.Log; import io.nuls.core.model.DoubleUtils; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/RoundValidResult.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/RoundValidResult.java similarity index 92% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/RoundValidResult.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/RoundValidResult.java index 960bffab3e..771631750c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/round/RoundValidResult.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/round/RoundValidResult.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.bo.round; +package io.nuls.consensus.model.bo.round; /** * 轮次信息验证结果类 * Information about rotation diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/Agent.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/Agent.java index e87d8d7615..7bfb57cb24 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Agent.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/Agent.java @@ -23,7 +23,7 @@ * * SOFTWARE. * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; @@ -33,7 +33,7 @@ import io.nuls.base.data.NulsHash; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; -import io.nuls.poc.model.bo.Chain; +import io.nuls.consensus.model.bo.Chain; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.SerializeUtils; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/CancelDeposit.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/CancelDeposit.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/CancelDeposit.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/CancelDeposit.java index d228f15b2f..02c82dfcc1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/CancelDeposit.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/CancelDeposit.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/DelayStopAgent.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/DelayStopAgent.java index 325100940d..6498eabe8d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/DelayStopAgent.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/DelayStopAgent.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; @@ -34,8 +34,6 @@ import io.nuls.core.parse.SerializeUtils; import java.io.IOException; -import java.util.HashSet; -import java.util.Set; /** * 停止节点信息类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Deposit.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/Deposit.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Deposit.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/Deposit.java index d78021b28f..36d1f973b3 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/Deposit.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/Deposit.java @@ -23,7 +23,7 @@ * * SOFTWARE. * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/RedPunishData.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/RedPunishData.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/RedPunishData.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/RedPunishData.java index 72e6b55fcc..fac206390b 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/RedPunishData.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/RedPunishData.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/StopAgent.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/StopAgent.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/StopAgent.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/StopAgent.java index 70fb6f4e02..f232970e99 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/StopAgent.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/StopAgent.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/YellowPunishData.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/YellowPunishData.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/YellowPunishData.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/YellowPunishData.java index e0c8623071..f3a692b553 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/bo/tx/txdata/YellowPunishData.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/bo/tx/txdata/YellowPunishData.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -package io.nuls.poc.model.bo.tx.txdata; +package io.nuls.consensus.model.bo.tx.txdata; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/CmdRegisterDto.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/CmdRegisterDto.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/CmdRegisterDto.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/CmdRegisterDto.java index 8b29d027a3..e91972e73c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/CmdRegisterDto.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/CmdRegisterDto.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.dto; +package io.nuls.consensus.model.dto; import java.util.List; /** diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/RandomSeedDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/RandomSeedDTO.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/RandomSeedDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/RandomSeedDTO.java index 787d62ef3f..ef13d54d9e 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/RandomSeedDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/RandomSeedDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto; +package io.nuls.consensus.model.dto; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractAgentDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractAgentDTO.java index 81503dff63..0ca7439b73 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 智能合约创建节点参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractDepositDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractDepositDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractDepositDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractDepositDTO.java index 7cd9a381c3..5911de736d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractDepositDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractDepositDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 智能合约委托共识参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractStopAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractStopAgentDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractStopAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractStopAgentDTO.java index 73d4f878ce..a153265f09 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractStopAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractStopAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 智能合约创建注销参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractWithdrawDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractWithdrawDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractWithdrawDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractWithdrawDTO.java index 28e030894a..f98ed7b329 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ContractWithdrawDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ContractWithdrawDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 智能合约退出共识参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateAgentDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateAgentDTO.java index 5f347e09ad..9806b4b2dc 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 创建节点参数类 * Creating Node Parameter Classes diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateDepositDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateDepositDTO.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateDepositDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateDepositDTO.java index a77bc4b2d6..44f9d11cca 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateDepositDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateDepositDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 创建委托交易参数类 * Create delegate transaction parameter class diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateMultiAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateMultiAgentDTO.java similarity index 89% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateMultiAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateMultiAgentDTO.java index 938bc9302c..87985b9b73 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateMultiAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateMultiAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 多签账户创建节点参数 * Multi-Sign Account Creation Node Parameters diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateMultiDepositDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateMultiDepositDTO.java similarity index 90% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateMultiDepositDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateMultiDepositDTO.java index f864f5bf5a..465ed57657 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/CreateMultiDepositDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/CreateMultiDepositDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 多签账户委托共识参数 * Multi-Signed Account Delegation Consensus Parameters diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/MultiWithdrawDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/MultiWithdrawDTO.java similarity index 89% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/MultiWithdrawDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/MultiWithdrawDTO.java index dedd8b5a14..548628f790 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/MultiWithdrawDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/MultiWithdrawDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 多签账户退出委托参数 * Multi-Signed Account Exit Delegation Parameters diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchAgentDTO.java similarity index 92% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchAgentDTO.java index 1108ad916b..25a68844bd 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 查询指定节点参数列 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchAllAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchAllAgentDTO.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchAllAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchAllAgentDTO.java index 72838b953e..29b1a4fda2 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchAllAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchAllAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 查询所有节点参数类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchContractAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchContractAgentDTO.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchContractAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchContractAgentDTO.java index fc21d133f7..3b669f2793 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchContractAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchContractAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 智能合约查询节点信息参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchContractDepositDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchContractDepositDTO.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchContractDepositDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchContractDepositDTO.java index d26c926216..fb989d012e 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchContractDepositDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchContractDepositDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 智能合约查询委托信息参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchDepositDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchDepositDTO.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchDepositDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchDepositDTO.java index ee384ac74e..664f6ba25d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchDepositDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchDepositDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 查询委托信息参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchPunishDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchPunishDTO.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchPunishDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchPunishDTO.java index 7f46e65615..d2a65b54ad 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/SearchPunishDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/SearchPunishDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 查询红/黄牌牌参数类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/StopAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/StopAgentDTO.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/StopAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/StopAgentDTO.java index ede1e19d59..e0a7b28e61 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/StopAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/StopAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 停止节点参数类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/StopMultiAgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/StopMultiAgentDTO.java similarity index 89% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/StopMultiAgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/StopMultiAgentDTO.java index ba087adabb..81ae892d1c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/StopMultiAgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/StopMultiAgentDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 多签账户停止节点参数 * Multi-Sign Account Stop Node Parameters diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ValidBlockDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ValidBlockDTO.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ValidBlockDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ValidBlockDTO.java index 909071a7e5..b7e95c3b5e 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/ValidBlockDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/ValidBlockDTO.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; /** * 区块验证参数 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/WithdrawDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/WithdrawDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/WithdrawDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/WithdrawDTO.java index 977bd684f2..effb0f1fc5 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/input/WithdrawDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/input/WithdrawDTO.java @@ -24,7 +24,7 @@ * */ -package io.nuls.poc.model.dto.input; +package io.nuls.consensus.model.dto.input; import io.nuls.core.model.StringUtils; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/AccountConsensusInfoDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/AccountConsensusInfoDTO.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/AccountConsensusInfoDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/AccountConsensusInfoDTO.java index 7f811f6bc7..170ee2ca1b 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/AccountConsensusInfoDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/AccountConsensusInfoDTO.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.dto.output; +package io.nuls.consensus.model.dto.output; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/AgentDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/AgentDTO.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/AgentDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/AgentDTO.java index 773ee28565..0338c20277 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/AgentDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/AgentDTO.java @@ -23,14 +23,14 @@ * */ -package io.nuls.poc.model.dto.output; +package io.nuls.consensus.model.dto.output; import com.fasterxml.jackson.annotation.JsonIgnore; import io.nuls.base.basic.AddressTool; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.utils.manager.AgentManager; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.utils.manager.AgentManager; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.model.BigIntegerUtils; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/DepositDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/DepositDTO.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/DepositDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/DepositDTO.java index 2709a886a5..d837de8f7c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/DepositDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/DepositDTO.java @@ -23,15 +23,15 @@ * */ -package io.nuls.poc.model.dto.output; +package io.nuls.consensus.model.dto.output; import io.nuls.base.basic.AddressTool; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.utils.manager.AgentManager; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.utils.manager.AgentManager; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.model.BigIntegerUtils; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/PunishLogDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/PunishLogDTO.java similarity index 88% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/PunishLogDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/PunishLogDTO.java index fdc55c2068..6abdca651e 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/PunishLogDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/PunishLogDTO.java @@ -1,8 +1,8 @@ -package io.nuls.poc.model.dto.output; +package io.nuls.consensus.model.dto.output; import io.nuls.base.basic.AddressTool; -import io.nuls.poc.utils.enumeration.PunishReasonEnum; -import io.nuls.poc.model.po.PunishLogPo; +import io.nuls.consensus.utils.enumeration.PunishReasonEnum; +import io.nuls.consensus.model.po.PunishLogPo; import io.nuls.core.rpc.util.NulsDateUtils; import java.util.Date; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/WholeNetConsensusInfoDTO.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/WholeNetConsensusInfoDTO.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/WholeNetConsensusInfoDTO.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/WholeNetConsensusInfoDTO.java index f103ca11eb..4bf72e4925 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/output/WholeNetConsensusInfoDTO.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/output/WholeNetConsensusInfoDTO.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.dto.output; +package io.nuls.consensus.model.dto.output; import com.fasterxml.jackson.annotation.JsonIgnore; import io.nuls.core.rpc.model.ApiModel; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinDto.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinDto.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinDto.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinDto.java index 2476197650..25e800aafb 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinDto.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinDto.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.nuls.poc.model.dto.transaction; +package io.nuls.consensus.model.dto.transaction; import io.nuls.core.rpc.model.ApiModel; import io.nuls.core.rpc.model.ApiModelProperty; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinFromDto.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinFromDto.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinFromDto.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinFromDto.java index 19debdf8a1..7d31aa5c4c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinFromDto.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinFromDto.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.nuls.poc.model.dto.transaction; +package io.nuls.consensus.model.dto.transaction; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.CoinFrom; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinToDto.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinToDto.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinToDto.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinToDto.java index 25647d00a9..5a05816dfa 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/CoinToDto.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/CoinToDto.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.nuls.poc.model.dto.transaction; +package io.nuls.consensus.model.dto.transaction; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.CoinTo; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/TransactionDto.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/TransactionDto.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/TransactionDto.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/TransactionDto.java index 5be52091b4..be6de3c53a 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/dto/transaction/TransactionDto.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/dto/transaction/TransactionDto.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.nuls.poc.model.dto.transaction; +package io.nuls.consensus.model.dto.transaction; import io.nuls.base.RPCUtil; import io.nuls.base.data.CoinData; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/AgentPo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/AgentPo.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/AgentPo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/po/AgentPo.java index e3d9b9ac86..a664a04572 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/AgentPo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/AgentPo.java @@ -24,7 +24,7 @@ * */ -package io.nuls.poc.model.po; +package io.nuls.consensus.model.po; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/DepositPo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/DepositPo.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/DepositPo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/po/DepositPo.java index 771f5ff353..664c55d87e 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/DepositPo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/DepositPo.java @@ -23,7 +23,7 @@ * */ -package io.nuls.poc.model.po; +package io.nuls.consensus.model.po; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/PunishLogPo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/PunishLogPo.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/PunishLogPo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/po/PunishLogPo.java index 7ef10b23b8..f15460bee1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/PunishLogPo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/PunishLogPo.java @@ -24,7 +24,7 @@ * */ -package io.nuls.poc.model.po; +package io.nuls.consensus.model.po; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/RandomSeedPo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/RandomSeedPo.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/RandomSeedPo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/po/RandomSeedPo.java index 2f612998ce..cb7914ccf9 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/RandomSeedPo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/RandomSeedPo.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.po; +package io.nuls.consensus.model.po; import io.nuls.base.basic.NulsByteBuffer; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/RandomSeedStatusPo.java b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/RandomSeedStatusPo.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/RandomSeedStatusPo.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/model/po/RandomSeedStatusPo.java index 2f4de555a8..8b71ba0565 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/model/po/RandomSeedStatusPo.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/model/po/RandomSeedStatusPo.java @@ -1,4 +1,4 @@ -package io.nuls.poc.model.po; +package io.nuls.consensus.model.po; import io.nuls.base.basic.AddressTool; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/call/CallMethodUtils.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/call/CallMethodUtils.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/call/CallMethodUtils.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/call/CallMethodUtils.java index 345cedc79f..d0f77382c1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/call/CallMethodUtils.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/call/CallMethodUtils.java @@ -1,4 +1,4 @@ -package io.nuls.poc.rpc.call; +package io.nuls.consensus.rpc.call; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -17,11 +17,11 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.dto.CmdRegisterDto; -import io.nuls.poc.utils.compare.BlockHeaderComparator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.dto.CmdRegisterDto; +import io.nuls.consensus.utils.compare.BlockHeaderComparator; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/AgentCmd.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/AgentCmd.java index 53cac320d5..b007c40498 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/AgentCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/AgentCmd.java @@ -1,9 +1,8 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; -import io.nuls.base.data.CoinData; import io.nuls.core.rpc.model.*; -import io.nuls.poc.model.dto.output.AgentDTO; -import io.nuls.poc.service.AgentService; +import io.nuls.consensus.model.dto.output.AgentDTO; +import io.nuls.consensus.service.AgentService; import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.basic.Result; @@ -20,6 +19,7 @@ * 2018/11/7 */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class AgentCmd extends BaseCmd { @Autowired private AgentService service; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/BlockCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/BlockCmd.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/BlockCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/BlockCmd.java index 5050045836..be1b6c5e2c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/BlockCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/BlockCmd.java @@ -1,7 +1,7 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; import io.nuls.core.rpc.model.*; -import io.nuls.poc.service.BlockService; +import io.nuls.consensus.service.BlockService; import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.basic.Result; @@ -16,6 +16,7 @@ * 2018/11/7 * */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class BlockCmd extends BaseCmd { @Autowired private BlockService service; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ChainCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/ChainCmd.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ChainCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/ChainCmd.java index 95a69cc2ed..6b45a199f6 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ChainCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/ChainCmd.java @@ -1,18 +1,17 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; +import io.nuls.common.ConfigBean; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.dto.output.AccountConsensusInfoDTO; +import io.nuls.consensus.model.dto.output.WholeNetConsensusInfoDTO; +import io.nuls.consensus.service.ChainService; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.dto.output.AccountConsensusInfoDTO; -import io.nuls.poc.model.dto.output.WholeNetConsensusInfoDTO; -import io.nuls.poc.service.ChainService; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,6 +22,7 @@ * 2018/11/7 */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class ChainCmd extends BaseCmd { @Autowired private ChainService service; @@ -156,7 +156,7 @@ public Response getRoundMemberList(Map params) { })) @SuppressWarnings("unchecked") public Response getConsensusConfig(Map params) { - Result result = service.getConsensusConfig(params); + Result result = service.getConsensusConfig(params); if (result.isFailed()) { return failed(result.getErrorCode()); } diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ConsensusTransactionHandler.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/ConsensusTransactionHandler.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ConsensusTransactionHandler.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/ConsensusTransactionHandler.java index 692ef01350..0ac3962170 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ConsensusTransactionHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/ConsensusTransactionHandler.java @@ -1,4 +1,4 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Autowired; @@ -6,8 +6,8 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.poc.service.AgentService; -import io.nuls.poc.service.DepositService; +import io.nuls.consensus.service.AgentService; +import io.nuls.consensus.service.DepositService; import java.util.Map; @@ -17,6 +17,7 @@ * @date 2019/6/1 */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class ConsensusTransactionHandler extends BaseCmd { @Autowired diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ContractCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/CsmContractCmd.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ContractCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/CsmContractCmd.java index 26e23143f6..acecd5f9d4 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/ContractCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/CsmContractCmd.java @@ -1,4 +1,4 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Autowired; @@ -6,7 +6,7 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.poc.service.ContractService; +import io.nuls.consensus.service.ContractService; import java.util.List; import java.util.Map; @@ -17,7 +17,8 @@ * 2019/5/5 * */ @Component -public class ContractCmd extends BaseCmd { +@NulsCoresCmd(module = ModuleE.CS) +public class CsmContractCmd extends BaseCmd { @Autowired private ContractService service; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/DepositCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/DepositCmd.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/DepositCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/DepositCmd.java index 3990adbc5e..eed9555ae7 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/DepositCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/DepositCmd.java @@ -1,9 +1,8 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; import io.nuls.core.rpc.model.*; -import io.nuls.poc.model.dto.output.AgentDTO; -import io.nuls.poc.model.dto.output.DepositDTO; -import io.nuls.poc.service.DepositService; +import io.nuls.consensus.model.dto.output.DepositDTO; +import io.nuls.consensus.service.DepositService; import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.basic.Result; @@ -19,6 +18,7 @@ * 2018/11/7 * */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class DepositCmd extends BaseCmd { @Autowired private DepositService service; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/MultiSignCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/MultiSignCmd.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/MultiSignCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/MultiSignCmd.java index 3fa0b9c71c..103344b4b1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/MultiSignCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/MultiSignCmd.java @@ -1,4 +1,4 @@ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; import io.nuls.core.basic.Result; import io.nuls.core.core.annotation.Autowired; @@ -6,7 +6,7 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.poc.service.MultiSignService; +import io.nuls.consensus.service.MultiSignService; import java.util.Map; @@ -18,6 +18,7 @@ * 2019/7/25 * */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class MultiSignCmd extends BaseCmd { @Autowired private MultiSignService service; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/RandomCmd.java b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/RandomCmd.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/RandomCmd.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/RandomCmd.java index c6248eb423..60e79e1c49 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/rpc/cmd/RandomCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/rpc/cmd/RandomCmd.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.nuls.poc.rpc.cmd; +package io.nuls.consensus.rpc.cmd; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -30,9 +30,9 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.poc.model.dto.RandomSeedDTO; -import io.nuls.poc.storage.RandomSeedsStorageService; -import io.nuls.poc.utils.RandomSeedCaculator; +import io.nuls.consensus.model.dto.RandomSeedDTO; +import io.nuls.consensus.storage.RandomSeedsStorageService; +import io.nuls.consensus.utils.RandomSeedCaculator; import java.math.BigInteger; import java.util.ArrayList; @@ -44,6 +44,7 @@ * @date: 2019-07-17 */ @Component +@NulsCoresCmd(module = ModuleE.CS) public class RandomCmd extends BaseCmd { @Autowired private RandomSeedsStorageService randomSeedService; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/AgentService.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/AgentService.java index 300d9aadd9..3feb1c5ca8 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/AgentService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/AgentService.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service; +package io.nuls.consensus.service; import io.nuls.core.basic.Result; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/BlockService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/BlockService.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/BlockService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/BlockService.java index af73ff2369..4c2f3265a6 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/BlockService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/BlockService.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service; +package io.nuls.consensus.service; import io.nuls.core.basic.Result; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/ChainService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/ChainService.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/ChainService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/ChainService.java index a14cce0163..23937f12a2 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/ChainService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/ChainService.java @@ -1,7 +1,6 @@ -package io.nuls.poc.service; +package io.nuls.consensus.service; import io.nuls.core.basic.Result; -import io.nuls.poc.model.bo.config.ConfigBean; import java.util.Map; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/ContractService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/ContractService.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/ContractService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/ContractService.java index 6680c54406..7bee47d00d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/ContractService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/ContractService.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service; +package io.nuls.consensus.service; import io.nuls.core.basic.Result; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/DepositService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/DepositService.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/DepositService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/DepositService.java index c87b397a69..1b3780bd71 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/DepositService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/DepositService.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service; +package io.nuls.consensus.service; import io.nuls.core.basic.Result; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/MultiSignService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/MultiSignService.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/MultiSignService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/MultiSignService.java index a609b8c438..1efa51ed50 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/MultiSignService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/MultiSignService.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service; +package io.nuls.consensus.service; import io.nuls.core.basic.Result; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/AgentServiceImpl.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/AgentServiceImpl.java index f3aaa38951..73745bb172 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/AgentServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/AgentServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -16,7 +16,6 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.log.Log; -import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.ObjectUtils; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; @@ -24,30 +23,29 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConfig; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.input.CreateAgentDTO; -import io.nuls.poc.model.dto.input.SearchAgentDTO; -import io.nuls.poc.model.dto.input.SearchAllAgentDTO; -import io.nuls.poc.model.dto.input.StopAgentDTO; -import io.nuls.poc.model.dto.output.AgentDTO; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.service.AgentService; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.utils.TxUtil; -import io.nuls.poc.utils.enumeration.ConsensusStatus; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.CoinDataManager; -import io.nuls.poc.utils.manager.RoundManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.input.CreateAgentDTO; +import io.nuls.consensus.model.dto.input.SearchAgentDTO; +import io.nuls.consensus.model.dto.input.SearchAllAgentDTO; +import io.nuls.consensus.model.dto.input.StopAgentDTO; +import io.nuls.consensus.model.dto.output.AgentDTO; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.service.AgentService; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.utils.TxUtil; +import io.nuls.consensus.utils.enumeration.ConsensusStatus; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.CoinDataManager; +import io.nuls.consensus.utils.manager.RoundManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/BlockServiceImpl.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/BlockServiceImpl.java index 604bd448c8..ddea99df17 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/BlockServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/BlockServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.NulsByteBuffer; @@ -10,15 +10,15 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.model.message.Response; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.dto.input.ValidBlockDTO; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.service.BlockService; -import io.nuls.poc.utils.manager.BlockManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.BlockValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.dto.input.ValidBlockDTO; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.service.BlockService; +import io.nuls.consensus.utils.manager.BlockManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.BlockValidator; import java.io.IOException; import java.util.ArrayList; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/ChainServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/ChainServiceImpl.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/ChainServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/ChainServiceImpl.java index 3c0f72a0d5..ac8de622de 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/ChainServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/ChainServiceImpl.java @@ -1,8 +1,24 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; +import io.nuls.common.ConfigBean; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.dto.input.SearchPunishDTO; +import io.nuls.consensus.model.dto.output.AccountConsensusInfoDTO; +import io.nuls.consensus.model.dto.output.PunishLogDTO; +import io.nuls.consensus.model.dto.output.WholeNetConsensusInfoDTO; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.service.ChainService; +import io.nuls.consensus.utils.manager.*; +import io.nuls.consensus.utils.validator.BatchValidator; import io.nuls.core.basic.Result; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; @@ -12,22 +28,6 @@ import io.nuls.core.model.ByteUtils; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.dto.input.SearchPunishDTO; -import io.nuls.poc.model.dto.output.AccountConsensusInfoDTO; -import io.nuls.poc.model.dto.output.PunishLogDTO; -import io.nuls.poc.model.dto.output.WholeNetConsensusInfoDTO; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.service.ChainService; -import io.nuls.poc.utils.manager.*; -import io.nuls.poc.utils.validator.BatchValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/ContractServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/ContractServiceImpl.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/ContractServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/ContractServiceImpl.java index fa1111e4c7..46b9f637b2 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/ContractServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/ContractServiceImpl.java @@ -1,9 +1,8 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; -import io.nuls.base.protocol.Protocol; import io.nuls.base.protocol.ProtocolGroupManager; import io.nuls.core.basic.Result; import io.nuls.core.constant.TxType; @@ -14,28 +13,27 @@ import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.input.*; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.service.ContractService; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.CoinDataManager; -import io.nuls.poc.utils.manager.RoundManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.input.*; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.service.ContractService; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.CoinDataManager; +import io.nuls.consensus.utils.manager.RoundManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/DepositServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/DepositServiceImpl.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/DepositServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/DepositServiceImpl.java index 1bf7e93c5f..ed5ab718de 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/DepositServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/DepositServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -13,27 +13,26 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.ObjectUtils; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.dto.input.CreateDepositDTO; -import io.nuls.poc.model.dto.input.SearchDepositDTO; -import io.nuls.poc.model.dto.input.WithdrawDTO; -import io.nuls.poc.model.dto.output.DepositDTO; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.service.DepositService; -import io.nuls.poc.utils.TxUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.CoinDataManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.dto.input.CreateDepositDTO; +import io.nuls.consensus.model.dto.input.SearchDepositDTO; +import io.nuls.consensus.model.dto.input.WithdrawDTO; +import io.nuls.consensus.model.dto.output.DepositDTO; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.service.DepositService; +import io.nuls.consensus.utils.TxUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.CoinDataManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/MultiSignServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/MultiSignServiceImpl.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/MultiSignServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/MultiSignServiceImpl.java index cadc685fc2..7011108e24 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/MultiSignServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/MultiSignServiceImpl.java @@ -1,40 +1,36 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; -import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.TransactionFeeCalculator; import io.nuls.base.data.*; import io.nuls.base.signture.MultiSignTxSignature; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.SignatureUtil; -import io.nuls.base.signture.TransactionSignature; import io.nuls.core.basic.Result; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.log.Log; import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.input.*; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.service.MultiSignService; -import io.nuls.poc.utils.TxUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.CoinDataManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.input.*; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.service.MultiSignService; +import io.nuls.consensus.utils.TxUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.CoinDataManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/RandomSeedService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/RandomSeedService.java similarity index 89% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/RandomSeedService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/RandomSeedService.java index 8ccd0a2cf2..5217e09289 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/service/impl/RandomSeedService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/service/impl/RandomSeedService.java @@ -1,4 +1,4 @@ -package io.nuls.poc.service.impl; +package io.nuls.consensus.service.impl; import io.nuls.base.data.BlockExtendsData; @@ -6,11 +6,11 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.model.ArraysTool; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.RandomSeedPo; -import io.nuls.poc.model.po.RandomSeedStatusPo; -import io.nuls.poc.storage.RandomSeedsStorageService; -import io.nuls.poc.utils.RandomSeedUtils; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.RandomSeedPo; +import io.nuls.consensus.model.po.RandomSeedStatusPo; +import io.nuls.consensus.storage.RandomSeedsStorageService; +import io.nuls.consensus.utils.RandomSeedUtils; /** * @author Niels diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/AgentStorageService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/AgentStorageService.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/AgentStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/AgentStorageService.java index 6e01636342..72d95c27ca 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/AgentStorageService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/AgentStorageService.java @@ -1,7 +1,7 @@ -package io.nuls.poc.storage; +package io.nuls.consensus.storage; import io.nuls.base.data.NulsHash; -import io.nuls.poc.model.po.AgentPo; +import io.nuls.consensus.model.po.AgentPo; import io.nuls.core.exception.NulsException; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/DepositStorageService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/DepositStorageService.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/DepositStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/DepositStorageService.java index 1d7994a0eb..33ceeb5d45 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/DepositStorageService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/DepositStorageService.java @@ -1,7 +1,7 @@ -package io.nuls.poc.storage; +package io.nuls.consensus.storage; import io.nuls.base.data.NulsHash; -import io.nuls.poc.model.po.DepositPo; +import io.nuls.consensus.model.po.DepositPo; import io.nuls.core.exception.NulsException; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/PunishStorageService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/PunishStorageService.java similarity index 90% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/PunishStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/PunishStorageService.java index 0f9fe054e8..ec8272e4b7 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/PunishStorageService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/PunishStorageService.java @@ -1,6 +1,6 @@ -package io.nuls.poc.storage; +package io.nuls.consensus.storage; -import io.nuls.poc.model.po.PunishLogPo; +import io.nuls.consensus.model.po.PunishLogPo; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/RandomSeedsStorageService.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/RandomSeedsStorageService.java similarity index 83% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/RandomSeedsStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/RandomSeedsStorageService.java index d9020546d5..3cc62eb423 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/RandomSeedsStorageService.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/RandomSeedsStorageService.java @@ -1,8 +1,8 @@ -package io.nuls.poc.storage; +package io.nuls.consensus.storage; -import io.nuls.poc.model.po.RandomSeedPo; -import io.nuls.poc.model.po.RandomSeedStatusPo; +import io.nuls.consensus.model.po.RandomSeedPo; +import io.nuls.consensus.model.po.RandomSeedStatusPo; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/AgentStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/AgentStorageServiceImpl.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/AgentStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/AgentStorageServiceImpl.java index e8b477b443..ddf7a3eb01 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/AgentStorageServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/AgentStorageServiceImpl.java @@ -1,13 +1,12 @@ -package io.nuls.poc.storage.impl; +package io.nuls.consensus.storage.impl; import io.nuls.base.data.NulsHash; import io.nuls.core.core.annotation.Component; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.core.core.annotation.Service; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.storage.AgentStorageService; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/DepositStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/DepositStorageServiceImpl.java similarity index 92% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/DepositStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/DepositStorageServiceImpl.java index 95ece7cfad..e56c386791 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/DepositStorageServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/DepositStorageServiceImpl.java @@ -1,13 +1,12 @@ -package io.nuls.poc.storage.impl; +package io.nuls.consensus.storage.impl; import io.nuls.base.data.NulsHash; import io.nuls.core.core.annotation.Component; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.core.core.annotation.Service; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.DepositStorageService; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/PunishStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/PunishStorageServiceImpl.java similarity index 89% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/PunishStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/PunishStorageServiceImpl.java index c90900ce25..860a2c690f 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/PunishStorageServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/PunishStorageServiceImpl.java @@ -1,12 +1,11 @@ -package io.nuls.poc.storage.impl; +package io.nuls.consensus.storage.impl; import io.nuls.core.core.annotation.Component; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.storage.PunishStorageService; -import io.nuls.core.core.annotation.Service; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.storage.PunishStorageService; import io.nuls.core.log.Log; import java.util.ArrayList; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/RandomSeedsStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/RandomSeedsStorageServiceImpl.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/RandomSeedsStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/RandomSeedsStorageServiceImpl.java index c561372861..a9ea0ba878 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/storage/impl/RandomSeedsStorageServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/storage/impl/RandomSeedsStorageServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.poc.storage.impl; +package io.nuls.consensus.storage.impl; import io.nuls.base.basic.NulsByteBuffer; @@ -8,10 +8,10 @@ import io.nuls.core.model.ArraysTool; import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.RandomSeedPo; -import io.nuls.poc.model.po.RandomSeedStatusPo; -import io.nuls.poc.storage.RandomSeedsStorageService; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.RandomSeedPo; +import io.nuls.consensus.model.po.RandomSeedStatusPo; +import io.nuls.consensus.storage.RandomSeedsStorageService; import java.util.ArrayList; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/CoinBaseProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/CoinBaseProcessor.java similarity index 90% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/CoinBaseProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/CoinBaseProcessor.java index c5113c6e6a..0b12a8dffe 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/CoinBaseProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/CoinBaseProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; @@ -7,10 +7,10 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.service.impl.RandomSeedService; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.RoundManager; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.service.impl.RandomSeedService; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.RoundManager; import java.util.List; import java.util.Map; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractCreateAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractCreateAgentProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractCreateAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractCreateAgentProcessor.java index a86b8af6b3..6c6f602343 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractCreateAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractCreateAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; @@ -9,15 +9,15 @@ import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractDepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractDepositProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractDepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractDepositProcessor.java index 183fd631f8..ba8bf60e1a 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractDepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractDepositProcessor.java @@ -1,6 +1,5 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; -import com.fasterxml.jackson.core.JsonProcessingException; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; @@ -10,14 +9,14 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractStopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractStopAgentProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractStopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractStopAgentProcessor.java index e7fc6531e6..2cb0790ea7 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractStopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractStopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -10,17 +10,17 @@ import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractWithdrawProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractWithdrawProcessor.java similarity index 91% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractWithdrawProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractWithdrawProcessor.java index a54dc49beb..3c9e2f674a 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/ContractWithdrawProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/ContractWithdrawProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -9,18 +9,18 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/CreateAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/CreateAgentProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/CreateAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/CreateAgentProcessor.java index 05d8654e7c..7afa5ab4da 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/CreateAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/CreateAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; @@ -8,14 +8,14 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/DepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/DepositProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/DepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/DepositProcessor.java index 35a58d6f4c..65417eed68 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/DepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/DepositProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -8,13 +8,13 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/RedPunishProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/RedPunishProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/RedPunishProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/RedPunishProcessor.java index cadee9d5a0..d5755e0078 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/RedPunishProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/RedPunishProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; @@ -8,14 +8,13 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.PunishManager; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.PunishManager; -import java.io.IOException; import java.util.*; /** * 红牌交易处理器 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/StopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/StopAgentProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/StopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/StopAgentProcessor.java index 69e53acb5e..a923584be5 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/StopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/StopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -9,16 +9,16 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/WithdrawProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/WithdrawProcessor.java similarity index 92% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/WithdrawProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/WithdrawProcessor.java index bb2cb5d774..1608aebb55 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/WithdrawProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/WithdrawProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -8,17 +8,17 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/YellowPunishProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/YellowPunishProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/YellowPunishProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/YellowPunishProcessor.java index 0a9098fe56..8cd2050c70 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v1/YellowPunishProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v1/YellowPunishProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v1; +package io.nuls.consensus.tx.v1; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; @@ -7,10 +7,10 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.PunishManager; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.PunishManager; import java.util.ArrayList; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/ContractDepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/ContractDepositProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/ContractDepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/ContractDepositProcessor.java index f084ab353a..e68b4ec86d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/ContractDepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/ContractDepositProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v2; +package io.nuls.consensus.tx.v2; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -9,15 +9,15 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/ContractStopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/ContractStopAgentProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/ContractStopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/ContractStopAgentProcessor.java index eac0f10326..f998b565ca 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/ContractStopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/ContractStopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v2; +package io.nuls.consensus.tx.v2; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.CoinData; @@ -12,17 +12,17 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/DepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/DepositProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/DepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/DepositProcessor.java index dafa4fbb4e..62b0e822fc 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/DepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/DepositProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v2; +package io.nuls.consensus.tx.v2; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; @@ -8,14 +8,14 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/StopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/StopAgentProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/StopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/StopAgentProcessor.java index 9ddb14bfe7..669b4d1676 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v2/StopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v2/StopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v2; +package io.nuls.consensus.tx.v2; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.CoinData; @@ -11,16 +11,16 @@ import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/ContractDepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/ContractDepositProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/ContractDepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/ContractDepositProcessor.java index f7acce3548..8d7541538c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/ContractDepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/ContractDepositProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v3; +package io.nuls.consensus.tx.v3; import io.nuls.base.data.*; import io.nuls.base.protocol.TransactionProcessor; @@ -7,15 +7,15 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/ContractStopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/ContractStopAgentProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/ContractStopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/ContractStopAgentProcessor.java index 496cfc5bfb..3da5fef3a5 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/ContractStopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/ContractStopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v3; +package io.nuls.consensus.tx.v3; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.CoinData; @@ -12,17 +12,17 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.transaction.TransactionDto; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.transaction.TransactionDto; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/CreateAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/CreateAgentProcessor.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/CreateAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/CreateAgentProcessor.java index 6da68ec6be..96db20bcf0 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/CreateAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/CreateAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v3; +package io.nuls.consensus.tx.v3; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -11,14 +11,14 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/DepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/DepositProcessor.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/DepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/DepositProcessor.java index 4939d9cef6..6f4a92dcd1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/DepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/DepositProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v3; +package io.nuls.consensus.tx.v3; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -11,15 +11,15 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/StopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/StopAgentProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/StopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/StopAgentProcessor.java index 4a541d4c71..e6e80ca420 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/StopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/StopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v3; +package io.nuls.consensus.tx.v3; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -13,18 +13,18 @@ import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/WithdrawProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/WithdrawProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/WithdrawProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/WithdrawProcessor.java index eafa781e45..88e1fde2fb 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v3/WithdrawProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v3/WithdrawProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v3; +package io.nuls.consensus.tx.v3; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -11,17 +11,17 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/CreateAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/CreateAgentProcessor.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/CreateAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/CreateAgentProcessor.java index c865eb1520..113e1b5d81 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/CreateAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/CreateAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v4; +package io.nuls.consensus.tx.v4; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -13,16 +13,16 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/DelayStopAgentProcessor.java similarity index 92% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/DelayStopAgentProcessor.java index 7ad1098232..ddf5c99c27 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DelayStopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/DelayStopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v4; +package io.nuls.consensus.tx.v4; import io.nuls.base.data.*; import io.nuls.base.protocol.TransactionProcessor; @@ -6,22 +6,17 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.parse.SerializeUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.DelayStopAgent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.enumeration.PunishType; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.DelayStopAgent; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DepositProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/DepositProcessor.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DepositProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/DepositProcessor.java index 85e1ceaa61..d9d82ab5b5 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/DepositProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/DepositProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v4; +package io.nuls.consensus.tx.v4; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; @@ -9,16 +9,16 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/RedPunishProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/RedPunishProcessor.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/RedPunishProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/RedPunishProcessor.java index 6ee37dbfb5..4eb8954956 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/RedPunishProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/RedPunishProcessor.java @@ -1,27 +1,25 @@ -package io.nuls.poc.tx.v4; +package io.nuls.consensus.tx.v4; import io.nuls.base.basic.AddressTool; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; import io.nuls.base.protocol.TransactionProcessor; -import io.nuls.base.signture.BlockSignature; -import io.nuls.base.signture.SignatureUtil; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.enumeration.PunishReasonEnum; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.PunishManager; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.enumeration.PunishReasonEnum; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.PunishManager; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/StopAgentProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/StopAgentProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/StopAgentProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/StopAgentProcessor.java index 86923c6f12..ab21fdf009 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/StopAgentProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/StopAgentProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v4; +package io.nuls.consensus.tx.v4; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -14,18 +14,18 @@ import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/WithdrawProcessor.java b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/WithdrawProcessor.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/WithdrawProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/WithdrawProcessor.java index d08beb8526..12da84e46c 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/tx/v4/WithdrawProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/tx/v4/WithdrawProcessor.java @@ -1,4 +1,4 @@ -package io.nuls.poc.tx.v4; +package io.nuls.consensus.tx.v4; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; @@ -12,18 +12,18 @@ import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.LoggerUtil; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.DepositManager; -import io.nuls.poc.utils.validator.TxValidator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.LoggerUtil; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.DepositManager; +import io.nuls.consensus.utils.validator.TxValidator; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/LoggerUtil.java similarity index 84% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/LoggerUtil.java index 9399875f2e..5c5059e3d2 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/LoggerUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/LoggerUtil.java @@ -1,11 +1,9 @@ -package io.nuls.poc.utils; +package io.nuls.consensus.utils; -import ch.qos.logback.classic.Level; import io.nuls.core.log.logback.LoggerBuilder; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.rpc.model.ModuleE; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.Chain; +import io.nuls.consensus.model.bo.Chain; /** diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/RandomSeedCaculator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/RandomSeedCaculator.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/RandomSeedCaculator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/RandomSeedCaculator.java index f594ee632c..1a3233d78a 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/RandomSeedCaculator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/RandomSeedCaculator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils; +package io.nuls.consensus.utils; import io.nuls.core.crypto.KeccakHash; import io.nuls.core.crypto.Sha256Hash; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/RandomSeedUtils.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/RandomSeedUtils.java similarity index 92% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/RandomSeedUtils.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/RandomSeedUtils.java index 36491cccf8..d15271bde1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/RandomSeedUtils.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/RandomSeedUtils.java @@ -1,8 +1,8 @@ -package io.nuls.poc.utils; +package io.nuls.consensus.utils; import io.nuls.core.crypto.Sha256Hash; -import io.nuls.poc.model.po.RandomSeedStatusPo; +import io.nuls.consensus.model.po.RandomSeedStatusPo; import java.math.BigInteger; import java.util.Random; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/TxUtil.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/TxUtil.java similarity index 82% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/TxUtil.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/TxUtil.java index 81605ea2d1..4d4bba926b 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/TxUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/TxUtil.java @@ -1,18 +1,18 @@ -package io.nuls.poc.utils; +package io.nuls.consensus.utils; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.NulsHash; import io.nuls.core.exception.NulsException; import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.StringUtils; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.dto.input.CreateAgentDTO; -import io.nuls.poc.model.dto.input.CreateDepositDTO; -import io.nuls.poc.model.dto.input.StopAgentDTO; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.dto.input.CreateAgentDTO; +import io.nuls.consensus.model.dto.input.CreateDepositDTO; +import io.nuls.consensus.model.dto.input.StopAgentDTO; import java.util.Arrays; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/AgentComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparator.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/AgentComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparator.java index 5317fcc061..db5287fe20 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/AgentComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparator.java @@ -23,10 +23,10 @@ * */ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; -import io.nuls.poc.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Agent; import java.util.Comparator; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/AgentComparatorRpc.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparatorRpc.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/AgentComparatorRpc.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparatorRpc.java index 4c6e6922ad..c40e31b0ad 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/AgentComparatorRpc.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparatorRpc.java @@ -24,10 +24,10 @@ * */ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; -import io.nuls.poc.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Agent; import java.util.Comparator; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/BlockHeaderComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/BlockHeaderComparator.java similarity index 88% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/BlockHeaderComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/BlockHeaderComparator.java index 99aaae2892..94ea736423 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/BlockHeaderComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/BlockHeaderComparator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; import io.nuls.base.data.BlockHeader; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/CoinFromComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/CoinFromComparator.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/CoinFromComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/CoinFromComparator.java index 8ee0b13a31..668a2e5beb 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/CoinFromComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/CoinFromComparator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.CoinFrom; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/CoinToComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/CoinToComparator.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/CoinToComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/CoinToComparator.java index 4bdf075a31..96437bbce1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/CoinToComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/CoinToComparator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.CoinTo; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/DepositComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/DepositComparator.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/DepositComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/DepositComparator.java index 3799f9acd3..2a960c2f8e 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/DepositComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/DepositComparator.java @@ -23,10 +23,10 @@ * */ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; -import io.nuls.poc.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; import java.util.Comparator; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/EvidenceComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/EvidenceComparator.java similarity index 77% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/EvidenceComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/EvidenceComparator.java index 2aed421eb8..95e207fcdc 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/EvidenceComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/EvidenceComparator.java @@ -1,6 +1,6 @@ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; -import io.nuls.poc.model.bo.consensus.Evidence; +import io.nuls.consensus.model.bo.consensus.Evidence; import java.util.Comparator; /** diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/PunishLogComparator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/PunishLogComparator.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/PunishLogComparator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/PunishLogComparator.java index 844f6a7c6f..7db2bce0fe 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/compare/PunishLogComparator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/PunishLogComparator.java @@ -23,9 +23,9 @@ * */ -package io.nuls.poc.utils.compare; +package io.nuls.consensus.utils.compare; -import io.nuls.poc.model.po.PunishLogPo; +import io.nuls.consensus.model.po.PunishLogPo; import java.util.Comparator; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/ConsensusStatus.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/ConsensusStatus.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/ConsensusStatus.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/ConsensusStatus.java index 63c08b8591..e5bdcd0298 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/ConsensusStatus.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/ConsensusStatus.java @@ -24,7 +24,7 @@ * */ -package io.nuls.poc.utils.enumeration; +package io.nuls.consensus.utils.enumeration; /** * 共识状态枚举类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/PunishReasonEnum.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/PunishReasonEnum.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/PunishReasonEnum.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/PunishReasonEnum.java index 42293ba7eb..d682269a79 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/PunishReasonEnum.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/PunishReasonEnum.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -package io.nuls.poc.utils.enumeration; +package io.nuls.consensus.utils.enumeration; import io.nuls.core.parse.I18nUtils; /** diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/PunishType.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/PunishType.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/PunishType.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/PunishType.java index 85be88a703..d8b24fad97 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/enumeration/PunishType.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/enumeration/PunishType.java @@ -24,7 +24,7 @@ * */ -package io.nuls.poc.utils.enumeration; +package io.nuls.consensus.utils.enumeration; /** * 惩罚类型枚举类 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/AgentManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/AgentManager.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/AgentManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/AgentManager.java index fb914b4152..020ad71d01 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/AgentManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/AgentManager.java @@ -1,21 +1,21 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.compare.AgentComparator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.compare.AgentComparator; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/BlockManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/BlockManager.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/BlockManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/BlockManager.java index 6f2f576231..ef1058592d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/BlockManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/BlockManager.java @@ -1,13 +1,13 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.data.BlockExtendsData; import io.nuls.base.data.BlockHeader; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.compare.BlockHeaderComparator; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.compare.BlockHeaderComparator; import java.util.Iterator; import java.util.List; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/ChainManager.java similarity index 85% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/ChainManager.java index 7e7114ea14..29e019a35d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/ChainManager.java @@ -1,25 +1,23 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; -import io.nuls.base.protocol.ProtocolGroupManager; import io.nuls.base.protocol.ProtocolLoader; -import io.nuls.base.protocol.RegisterHelper; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.economic.base.service.EconomicService; +import io.nuls.consensus.economic.nuls.constant.ParamConstant; +import io.nuls.consensus.economic.nuls.model.bo.ConsensusConfigInfo; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.dto.CmdRegisterDto; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.LoggerUtil; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.model.DoubleUtils; import io.nuls.core.rockdb.constant.DBErrorCode; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.economic.base.service.EconomicService; -import io.nuls.economic.nuls.constant.ParamConstant; -import io.nuls.economic.nuls.model.bo.ConsensusConfigInfo; -import io.nuls.poc.constant.ConsensusConfig; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.dto.CmdRegisterDto; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.ConfigService; -import io.nuls.poc.utils.LoggerUtil; import java.math.BigInteger; import java.util.ArrayList; @@ -37,8 +35,6 @@ */ @Component public class ChainManager { - @Autowired - private ConfigService configService; @Autowired private AgentManager agentManager; @Autowired @@ -50,7 +46,7 @@ public class ChainManager { @Autowired private SchedulerManager schedulerManager; @Autowired - private ConsensusConfig config; + private NulsCoresConfig config; @Autowired private EconomicService economicService; @@ -82,7 +78,7 @@ public void initChain() throws Exception { */ initTable(chain); chainMap.put(chainId, chain); - ProtocolLoader.load(chainId); + //ProtocolLoader.load(chainId); Map param = new HashMap<>(4); double deflationRatio = DoubleUtils.sub(ConsensusConstant.VALUE_OF_ONE_HUNDRED, config.getDeflationRatio()); param.put(ParamConstant.CONSENUS_CONFIG, new ConsensusConfigInfo(chainId,configBean.getAssetId(),configBean.getPackingInterval(), @@ -91,20 +87,6 @@ public void initChain() throws Exception { } } - /** - * 注册链交易 - * Registration Chain Transaction - * */ - public void registerTx(){ - for (Chain chain:chainMap.values()) { - /* - * 链交易注册 - * Chain Trading Registration - * */ - int chainId = chain.getConfig().getChainId(); - RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); - } - } /** * 注册智能合约交易 @@ -182,7 +164,7 @@ private Map configChain() { 读取数据库链信息配置 Read database chain information configuration */ - Map configMap = configService.getList(); + Map configMap = CommonContext.CONFIG_BEAN_MAP; /* 如果系统是第一次运行，则本地数据库没有存储链信息，此时需要从配置文件读取主链配置信息 If the system is running for the first time, the local database does not have chain information, @@ -191,10 +173,7 @@ private Map configChain() { if (configMap == null || configMap.size() == 0) { ConfigBean configBean = config; configBean.setBlockReward(configBean.getInflationAmount().divide(ConsensusConstant.YEAR_MILLISECOND.divide(BigInteger.valueOf(configBean.getPackingInterval())))); - boolean saveSuccess = configService.save(configBean,configBean.getChainId()); - if(saveSuccess){ - configMap.put(configBean.getChainId(), configBean); - } + configMap.put(configBean.getChainId(), configBean); } return configMap; } catch (Exception e) { diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/CoinDataManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/CoinDataManager.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/CoinDataManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/CoinDataManager.java index fe9c707a10..0ed0112507 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/CoinDataManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/CoinDataManager.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -8,12 +8,12 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; import io.nuls.core.model.BigIntegerUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.rpc.call.CallMethodUtils; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.rpc.call.CallMethodUtils; import java.math.BigInteger; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConsensusManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/ConsensusManager.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConsensusManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/ConsensusManager.java index 2161d62419..e327406c11 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/ConsensusManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/ConsensusManager.java @@ -1,29 +1,30 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; +import io.nuls.common.NulsCoresConfig; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.economic.base.service.EconomicService; +import io.nuls.consensus.economic.nuls.constant.ParamConstant; +import io.nuls.consensus.economic.nuls.model.bo.AgentInfo; +import io.nuls.consensus.economic.nuls.model.bo.DepositInfo; +import io.nuls.consensus.economic.nuls.model.bo.RoundInfo; +import io.nuls.consensus.model.bo.BlockData; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.ChargeResultData; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.rpc.call.CallMethodUtils; import io.nuls.core.basic.Result; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.exception.NulsRuntimeException; -import io.nuls.economic.base.service.EconomicService; -import io.nuls.economic.nuls.constant.ParamConstant; -import io.nuls.economic.nuls.model.bo.AgentInfo; -import io.nuls.economic.nuls.model.bo.DepositInfo; -import io.nuls.economic.nuls.model.bo.RoundInfo; -import io.nuls.poc.constant.ConsensusConfig; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.BlockData; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.ChargeResultData; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.rpc.call.CallMethodUtils; + import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; @@ -40,7 +41,7 @@ public class ConsensusManager { @Autowired private PunishManager punishManager; @Autowired - private ConsensusConfig config; + private NulsCoresConfig config; @Autowired private CoinDataManager coinDataManager; @Autowired diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/DepositManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/DepositManager.java similarity index 94% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/DepositManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/DepositManager.java index 4bb3c13f42..4f6a0ac796 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/DepositManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/DepositManager.java @@ -1,15 +1,15 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.compare.DepositComparator; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.compare.DepositComparator; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/FixRedPunishBugHelper.java similarity index 91% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/FixRedPunishBugHelper.java index 07af9f7cf3..67a4bce0ed 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/FixRedPunishBugHelper.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/FixRedPunishBugHelper.java @@ -1,11 +1,11 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.storage.AgentStorageService; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.storage.AgentStorageService; @Component public class FixRedPunishBugHelper { diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/PunishManager.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/PunishManager.java index b374ea11f9..0e28b3bfc0 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/PunishManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/PunishManager.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; @@ -11,25 +11,25 @@ import io.nuls.core.model.ByteUtils; import io.nuls.core.model.DoubleUtils; import io.nuls.core.parse.SerializeUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.consensus.Evidence; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.storage.PunishStorageService; -import io.nuls.poc.utils.compare.PunishLogComparator; -import io.nuls.poc.utils.enumeration.PunishReasonEnum; -import io.nuls.poc.utils.enumeration.PunishType; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.consensus.Evidence; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.storage.PunishStorageService; +import io.nuls.consensus.utils.compare.PunishLogComparator; +import io.nuls.consensus.utils.enumeration.PunishReasonEnum; +import io.nuls.consensus.utils.enumeration.PunishType; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/RoundManager.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/RoundManager.java index e6f406ab06..9301eb7f15 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/RoundManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/RoundManager.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockExtendsData; @@ -11,15 +11,15 @@ import io.nuls.core.model.DoubleUtils; import io.nuls.core.model.StringUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.Deposit; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.enumeration.PunishType; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.Deposit; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.enumeration.PunishType; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/SchedulerManager.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/SchedulerManager.java similarity index 84% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/SchedulerManager.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/SchedulerManager.java index 5eaddd925a..713009ad76 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/manager/SchedulerManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/SchedulerManager.java @@ -1,8 +1,8 @@ -package io.nuls.poc.utils.manager; +package io.nuls.consensus.utils.manager; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.utils.thread.ConsensusProcessTask; -import io.nuls.poc.utils.thread.process.ConsensusProcess; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.utils.thread.ConsensusProcessTask; +import io.nuls.consensus.utils.thread.process.ConsensusProcess; import io.nuls.core.core.annotation.Component; import io.nuls.core.thread.ThreadUtils; import io.nuls.core.thread.commom.NulsThreadFactory; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/thread/ConsensusProcessTask.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/thread/ConsensusProcessTask.java similarity index 91% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/thread/ConsensusProcessTask.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/thread/ConsensusProcessTask.java index b44ba81ea3..5b0dbbc9bb 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/thread/ConsensusProcessTask.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/thread/ConsensusProcessTask.java @@ -23,11 +23,10 @@ * * SOFTWARE. * */ -package io.nuls.poc.utils.thread; +package io.nuls.consensus.utils.thread; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.utils.thread.process.ConsensusProcess; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.utils.thread.process.ConsensusProcess; /** * 共识任务 diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/thread/process/ConsensusProcess.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/thread/process/ConsensusProcess.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/thread/process/ConsensusProcess.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/thread/process/ConsensusProcess.java index e4f54b51d6..f8b6d7a273 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/thread/process/ConsensusProcess.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/thread/process/ConsensusProcess.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.thread.process; +package io.nuls.consensus.utils.thread.process; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -14,19 +14,19 @@ import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.BlockData; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.po.RandomSeedStatusPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.RandomSeedsStorageService; -import io.nuls.poc.utils.RandomSeedUtils; -import io.nuls.poc.utils.enumeration.ConsensusStatus; -import io.nuls.poc.utils.manager.ConsensusManager; -import io.nuls.poc.utils.manager.RoundManager; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.BlockData; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.po.RandomSeedStatusPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.storage.RandomSeedsStorageService; +import io.nuls.consensus.utils.RandomSeedUtils; +import io.nuls.consensus.utils.enumeration.ConsensusStatus; +import io.nuls.consensus.utils.manager.ConsensusManager; +import io.nuls.consensus.utils.manager.RoundManager; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BatchValidator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/BatchValidator.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BatchValidator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/BatchValidator.java index ae77a2ded1..abaa1e7203 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BatchValidator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/BatchValidator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.validator; +package io.nuls.consensus.utils.validator; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; @@ -7,15 +7,14 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.core.model.ByteArrayWrapper; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.*; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.*; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/BlockValidator.java similarity index 95% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/BlockValidator.java index f872dd6394..5d79355dbd 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/BlockValidator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/BlockValidator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.validator; +package io.nuls.consensus.utils.validator; import io.nuls.base.basic.AddressTool; import io.nuls.base.basic.NulsByteBuffer; @@ -10,22 +10,22 @@ import io.nuls.core.log.Log; import io.nuls.core.model.DoubleUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.round.MeetingMember; -import io.nuls.poc.model.bo.round.MeetingRound; -import io.nuls.poc.model.bo.round.RoundValidResult; -import io.nuls.poc.model.bo.tx.txdata.Agent; -import io.nuls.poc.model.bo.tx.txdata.RedPunishData; -import io.nuls.poc.model.bo.tx.txdata.YellowPunishData; -import io.nuls.poc.utils.compare.CoinFromComparator; -import io.nuls.poc.utils.compare.CoinToComparator; -import io.nuls.poc.utils.enumeration.PunishReasonEnum; -import io.nuls.poc.utils.manager.CoinDataManager; -import io.nuls.poc.utils.manager.ConsensusManager; -import io.nuls.poc.utils.manager.PunishManager; -import io.nuls.poc.utils.manager.RoundManager; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.round.MeetingMember; +import io.nuls.consensus.model.bo.round.MeetingRound; +import io.nuls.consensus.model.bo.round.RoundValidResult; +import io.nuls.consensus.model.bo.tx.txdata.Agent; +import io.nuls.consensus.model.bo.tx.txdata.RedPunishData; +import io.nuls.consensus.model.bo.tx.txdata.YellowPunishData; +import io.nuls.consensus.utils.compare.CoinFromComparator; +import io.nuls.consensus.utils.compare.CoinToComparator; +import io.nuls.consensus.utils.enumeration.PunishReasonEnum; +import io.nuls.consensus.utils.manager.CoinDataManager; +import io.nuls.consensus.utils.manager.ConsensusManager; +import io.nuls.consensus.utils.manager.PunishManager; +import io.nuls.consensus.utils.manager.RoundManager; import java.io.IOException; import java.util.*; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/TxValidator.java similarity index 96% rename from module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java rename to module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/TxValidator.java index bd2bc01bd6..462e6bbb00 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/utils/validator/TxValidator.java +++ b/module/nuls-cores/src/main/java/io/nuls/consensus/utils/validator/TxValidator.java @@ -1,4 +1,4 @@ -package io.nuls.poc.utils.validator; +package io.nuls.consensus.utils.validator; import io.nuls.base.basic.AddressTool; import io.nuls.base.basic.TransactionFeeCalculator; @@ -18,22 +18,22 @@ import io.nuls.core.model.ArraysTool; import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.StringUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.constant.ConsensusErrorCode; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.tx.txdata.*; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.poc.utils.compare.CoinFromComparator; -import io.nuls.poc.utils.compare.CoinToComparator; -import io.nuls.poc.utils.manager.AgentManager; -import io.nuls.poc.utils.manager.ChainManager; -import io.nuls.poc.utils.manager.CoinDataManager; -import io.nuls.poc.utils.manager.ConsensusManager; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusErrorCode; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.*; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.model.po.DepositPo; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.storage.AgentStorageService; +import io.nuls.consensus.storage.DepositStorageService; +import io.nuls.consensus.utils.compare.CoinFromComparator; +import io.nuls.consensus.utils.compare.CoinToComparator; +import io.nuls.consensus.utils.manager.AgentManager; +import io.nuls.consensus.utils.manager.ChainManager; +import io.nuls.consensus.utils.manager.CoinDataManager; +import io.nuls.consensus.utils.manager.ConsensusManager; import java.io.IOException; import java.math.BigInteger; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java b/module/nuls-cores/src/main/java/io/nuls/contract/SmartContractBootStrap.java similarity index 54% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java rename to module/nuls-cores/src/main/java/io/nuls/contract/SmartContractBootStrap.java index 3ad4d03e62..e4114c3683 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/SmartContractBootStrap.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/SmartContractBootStrap.java @@ -1,11 +1,10 @@ package io.nuls.contract; import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ModuleHelper; import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.RegisterHelper; import io.nuls.base.protocol.cmd.TransactionDispatcher; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractDBConstant; @@ -29,14 +28,9 @@ import io.nuls.core.model.StringUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rockdb.manager.RocksDBManager; -import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; import java.io.File; import java.lang.reflect.Field; @@ -57,10 +51,10 @@ * @date: 2019-03-14 */ @Component -public class SmartContractBootStrap extends RpcModule { +public class SmartContractBootStrap implements INulsCoresBootstrap { @Autowired - private ContractConfig contractConfig; + private NulsCoresConfig contractConfig; @Autowired private ChainManager chainManager; @Autowired @@ -68,24 +62,19 @@ public class SmartContractBootStrap extends RpcModule { @Autowired private ContractHelper contractHelper; - public static void main(String[] args) throws Exception { - systemConfig(); - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); + @Override + public int order() { + return 7; } - - /** - * 初始化模块信息，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 - */ @Override + public void mainFunction(String[] args) { + this.init(); + } + public void init() { try { - super.init(); - //增加地址工具类初始化 - AddressTool.init(addressPrefixDatas); + systemConfig(); initContractDefaultLog(); initNulsConfig(); initDB(); @@ -93,7 +82,6 @@ public void init() { initNRC721Standard(); initNRC1155Standard(); chainManager.initChain(); - ModuleHelper.init(this); } catch (Exception e) { Log.error("ContractBootsrap init error!"); throw new RuntimeException(e); @@ -139,12 +127,13 @@ private void initContractDefaultLog() { private void initNRC20Standard() { String json = null; try { - json = IoUtils.read(NRC20_STANDARD_FILE); + json = IoUtils.read("contract" + File.separator + NRC20_STANDARD_FILE); } catch (Exception e) { // skip it Log.error("init NRC20Standard error.", e); } if (json == null) { + Log.warn("init NRC20Standard empty data file!"); return; } @@ -163,12 +152,13 @@ private void initNRC20Standard() { private void initNRC721Standard() { String json = null; try { - json = IoUtils.read(NRC721_STANDARD_FILE); + json = IoUtils.read("contract" + File.separator + NRC721_STANDARD_FILE); } catch (Exception e) { // skip it Log.error("init NRC721Standard error.", e); } if (json == null) { + Log.warn("init NRC721Standard empty data file!"); return; } @@ -187,12 +177,13 @@ private void initNRC721Standard() { private void initNRC1155Standard() { String json = null; try { - json = IoUtils.read(NRC1155_STANDARD_FILE); + json = IoUtils.read("contract" + File.separator + NRC1155_STANDARD_FILE); } catch (Exception e) { // skip it Log.error("init NRC1155Standard error.", e); } if (json == null) { + Log.warn("init NRC1155Standard empty data file!"); return; } @@ -211,27 +202,11 @@ private void initNRC1155Standard() { */ private void initDB() throws Exception { Set skipTables = new HashSet<>(); - skipTables.add(ContractDBConstant.DB_NAME_CONTRACT + "_" + contractConfig.getChainConfig().getChainId()); + skipTables.add(ContractDBConstant.DB_NAME_CONTRACT + "_" + contractConfig.getChainId()); RocksDBManager.init(ContractContext.DATA_PATH, null, skipTables); ContractUtil.createTable(ContractDBConstant.DB_NAME_CONGIF); } - /** - * 返回此模块的依赖模块 - * 可写作 return new Module[]{new Module(ModuleE.LG.abbr, "1.0"),new Module(ModuleE.TX.abbr, "1.0")} - * - * @return - */ - @Override - public Module[] declareDependent() { - return new Module[]{new Module(ModuleE.TX.abbr, "1.0"), - new Module(ModuleE.LG.abbr, "1.0"), - new Module(ModuleE.BL.abbr, "1.0"), - new Module(ModuleE.AC.abbr, "1.0"), - new Module(ModuleE.NW.abbr, "1.0"), - new Module(ModuleE.CS.abbr, "1.0")}; - } - /** * 返回当前模块的描述信息 * @@ -242,97 +217,45 @@ public Module moduleInfo() { return new Module(ModuleE.SC.abbr, "1.0"); } - /** - * 已完成spring init注入，开始启动模块 - * - * @return 如果启动完成返回true，模块将进入ready状态，若启动失败返回false，10秒后会再次调用此方法 - */ - @Override - public boolean doStart() { + private boolean doStart() { TransactionDispatcher dispatcher = SpringLiteContext.getBean(TransactionDispatcher.class); TransactionCommitAdvice commitAdvice = SpringLiteContext.getBean(TransactionCommitAdvice.class); TransactionRollbackAdvice rollbackAdvice = SpringLiteContext.getBean(TransactionRollbackAdvice.class); - dispatcher.register(commitAdvice, rollbackAdvice); + dispatcher.register(ModuleE.SC, commitAdvice, rollbackAdvice); Log.info("module chain do start"); return true; } - /** - * 所有外部依赖进入ready状态后会调用此方法，正常启动后返回Running状态 - * - * @return - */ - @Override - public RpcModuleState onDependenciesReady() { + public void onDependenciesReady() { + doStart(); Log.info("all dependency module ready"); - NulsDateUtils.getInstance().start(); - return RpcModuleState.Running; - } - - @Override - public void onDependenciesReady(Module module) { - Log.info("dependencies [{}] ready", module.getName()); - if (module.getName().equals(ModuleE.TX.abbr)) { - /* - * 注册交易到交易管理模块 - */ - Map chainMap = chainManager.getChainMap(); - for (Chain chain : chainMap.values()) { - int chainId = chain.getChainId(); - boolean registerTx = RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); - Log.info("register tx type to tx module, chain id is {}, result is {}", chainId, registerTx); - } - } // add by pierre at 2019-11-02 需要协议升级 done - if (module.getName().equals(ModuleE.LG.abbr)) { - // 缓存token注册资产的资产ID和token合约地址 - Map chainMap = chainManager.getChainMap(); - for (Chain chain : chainMap.values()) { - int chainId = chain.getChainId(); - if(ProtocolGroupManager.getCurrentVersion(chainId) < ContractContext.UPDATE_VERSION_V250) { - continue; - } - List regTokenList; - try { - regTokenList = LedgerCall.getRegTokenList(chainId); - if(regTokenList != null && !regTokenList.isEmpty()) { - Map tokenAssetsInfoMap = chain.getTokenAssetsInfoMap(); - Map tokenAssetsContractAddressInfoMap = chain.getTokenAssetsContractAddressInfoMap(); - regTokenList.stream().forEach(map -> { - int assetId = Integer.parseInt(map.get("assetId").toString()); - String tokenContractAddress = map.get("assetOwnerAddress").toString(); - tokenAssetsInfoMap.put(tokenContractAddress, new ContractTokenAssetsInfo(chainId, assetId)); - tokenAssetsContractAddressInfoMap.put(chainId + "-" + assetId, tokenContractAddress); - }); - } - } catch (NulsException e) { - throw new RuntimeException(e); + // 缓存token注册资产的资产ID和token合约地址 + Map chainMap = chainManager.getChainMap(); + for (Chain chain : chainMap.values()) { + int chainId = chain.getChainId(); + if(ProtocolGroupManager.getCurrentVersion(chainId) < ContractContext.UPDATE_VERSION_V250) { + continue; + } + List regTokenList; + try { + regTokenList = LedgerCall.getRegTokenList(chainId); + if(regTokenList != null && !regTokenList.isEmpty()) { + Map tokenAssetsInfoMap = chain.getTokenAssetsInfoMap(); + Map tokenAssetsContractAddressInfoMap = chain.getTokenAssetsContractAddressInfoMap(); + regTokenList.stream().forEach(map -> { + int assetId = Integer.parseInt(map.get("assetId").toString()); + String tokenContractAddress = map.get("assetOwnerAddress").toString(); + tokenAssetsInfoMap.put(tokenContractAddress, new ContractTokenAssetsInfo(chainId, assetId)); + tokenAssetsContractAddressInfoMap.put(chainId + "-" + assetId, tokenContractAddress); + }); } - Log.info("initial cross token asset completed"); + } catch (NulsException e) { + throw new RuntimeException(e); } + Log.info("initial cross token asset completed"); } // end code by pierre - if (module.getName().equals(ModuleE.PU.abbr)) { - /* - * 注册协议到协议升级模块 - */ - Map chainMap = chainManager.getChainMap(); - for (Chain chain : chainMap.values()) { - int chainId = chain.getChainId(); - RegisterHelper.registerProtocol(chainId); - Log.info("register protocol to pu module, chain id is {}", chainId); - } - } } - /** - * 某个外部依赖连接丢失后，会调用此方法，可控制模块状态，如果返回Ready,则表明模块退化到Ready状态，当依赖重新准备完毕后，将重新触发onDependenciesReady方法，若返回的状态是Running，将不会重新触发onDependenciesReady - * - * @param dependenciesModule - * @return - */ - @Override - public RpcModuleState onDependenciesLoss(Module dependenciesModule) { - return RpcModuleState.Ready; - } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractBatchEndCallable.java b/module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractBatchEndCallable.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractBatchEndCallable.java rename to module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractBatchEndCallable.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallable.java b/module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallable.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallable.java rename to module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallable.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java b/module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java rename to module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java b/module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java rename to module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV8.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java b/module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractContext.java rename to module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java b/module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java rename to module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractCmdConstant.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java b/module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractConstant.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractConstant.java rename to module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractConstant.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractDBConstant.java b/module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractDBConstant.java similarity index 91% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractDBConstant.java rename to module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractDBConstant.java index 811ef2e39e..45408160a1 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractDBConstant.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractDBConstant.java @@ -43,8 +43,6 @@ public interface ContractDBConstant { String DB_NAME_CONTRACT_ADDRESS = "contract_address"; String DB_NAME_CONTRACT_EXECUTE_RESULT = "contract_execute_result"; - String DB_NAME_CONTRACT_NRC20_TOKEN_TRANSFER = "contract_nrc20_token_transfer"; - String DB_NAME_CONTRACT_NRC20_TOKEN_ADDRESS = "contract_nrc20_token_address"; String DB_NAME_CONTRACT_OFFLINE_TX_HASH_LIST = "contract_offline_tx_hash_list"; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractErrorCode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/constant/ContractErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/constant/ContractErrorCode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/BatchInfoStatus.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/BatchInfoStatus.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/BatchInfoStatus.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/BatchInfoStatus.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/BlockType.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/BlockType.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/BlockType.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/BlockType.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/CmdRegisterMode.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/CmdRegisterMode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/CmdRegisterMode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/CmdRegisterMode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/CmdRegisterReturnType.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/CmdRegisterReturnType.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/CmdRegisterReturnType.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/CmdRegisterReturnType.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/ContractStatus.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/ContractStatus.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/ContractStatus.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/ContractStatus.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/LedgerUnConfirmedTxStatus.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/LedgerUnConfirmedTxStatus.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/LedgerUnConfirmedTxStatus.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/LedgerUnConfirmedTxStatus.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java b/module/nuls-cores/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java rename to module/nuls-cores/src/main/java/io/nuls/contract/enums/TokenTypeStatus.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractConflictChecker.java b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractConflictChecker.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractConflictChecker.java rename to module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractConflictChecker.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractHelper.java similarity index 81% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java rename to module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractHelper.java index 253b491526..bb74d2051a 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractHelper.java @@ -34,11 +34,9 @@ import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.manager.ContractTempBalanceManager; -import io.nuls.contract.manager.ContractTokenBalanceManager; import io.nuls.contract.model.bo.*; import io.nuls.contract.model.dto.ContractConstructorInfoDto; import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.tx.ContractReturnGasTransaction; import io.nuls.contract.model.txdata.CallContractData; import io.nuls.contract.model.txdata.ContractData; @@ -46,14 +44,11 @@ import io.nuls.contract.rpc.call.LedgerCall; import io.nuls.contract.service.ContractService; import io.nuls.contract.storage.ContractAddressStorageService; -import io.nuls.contract.storage.ContractTokenAddressStorageService; -import io.nuls.contract.storage.ContractTokenTransferStorageService; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.util.VMContext; import io.nuls.contract.vm.program.*; import io.nuls.core.basic.Result; -import io.nuls.core.basic.VarInt; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; @@ -61,7 +56,6 @@ import io.nuls.core.model.FormatValidUtils; import io.nuls.core.model.LongUtils; import io.nuls.core.model.StringUtils; -import org.bouncycastle.util.Arrays; import java.io.IOException; import java.math.BigInteger; @@ -86,10 +80,6 @@ public class ContractHelper { @Autowired private ContractAddressStorageService contractAddressStorageService; @Autowired - private ContractTokenTransferStorageService contractTokenTransferStorageService; - @Autowired - private ContractTokenAddressStorageService contractTokenAddressStorageService; - @Autowired private ContractService contractService; private static final BigInteger MAXIMUM_DECIMALS = BigInteger.valueOf(18L); @@ -787,184 +777,6 @@ public Result getContractToken(int chainId, BlockHeader block } - public void dealNrc20Events(int chainId, byte[] newestStateRoot, Transaction tx, ContractResult contractResult, ContractAddressInfoPo po) { - if (po == null) { - return; - } - Map infoPoMap = new HashMap<>(); - infoPoMap.put(AddressTool.getStringAddressByBytes(po.getContractAddress()), po); - this.dealNrc20Events(chainId, newestStateRoot, tx.getBlockHeight(), tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); - } - - public void dealNrc20Events(int chainId, byte[] newestStateRoot, long blockHeight, NulsHash txHash, long txTime, List events, boolean execSuccess, Map infoPoMap) { - try { - int size = events.size(); - // 目前只处理Transfer事件, 为了刷新账户的token余额 - String event; - ContractAddressInfoPo contractAddressInfo; - if (events != null && size > 0) { - for (int i = 0; i < size; i++) { - event = events.get(i); - // 按照NRC20标准，TransferEvent事件中第一个参数是转出地址-from，第二个参数是转入地址-to, 第三个参数是金额 - ContractTokenTransferInfoPo tokenTransferInfoPo = ContractUtil.convertJsonToTokenTransferInfoPo(chainId, event); - if (tokenTransferInfoPo == null) { - continue; - } - String contractAddress = tokenTransferInfoPo.getContractAddress(); - if (StringUtils.isBlank(contractAddress)) { - continue; - } - if (!AddressTool.validAddress(chainId, contractAddress)) { - continue; - } - contractAddressInfo = infoPoMap.get(contractAddress); - if (contractAddressInfo == null) { - byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); - Result contractAddressInfoResult = this.getContractAddressInfo(chainId, contractAddressBytes); - contractAddressInfo = contractAddressInfoResult.getData(); - } - //if (Arrays.areEqual(po.getContractAddress(), contractAddressBytes)) { - // contractAddressInfo = po; - //} else { - // Result contractAddressInfoResult = this.getContractAddressInfo(chainId, contractAddressBytes); - // contractAddressInfo = contractAddressInfoResult.getData(); - //} - - if (contractAddressInfo == null) { - continue; - } - // 事件不是NRC20合约的事件 - if (!contractAddressInfo.isNrc20()) { - continue; - } - byte[] txHashBytes; - byte[] from = tokenTransferInfoPo.getFrom(); - byte[] to = tokenTransferInfoPo.getTo(); - tokenTransferInfoPo.setName(contractAddressInfo.getNrc20TokenName()); - tokenTransferInfoPo.setSymbol(contractAddressInfo.getNrc20TokenSymbol()); - tokenTransferInfoPo.setDecimals(contractAddressInfo.getDecimals()); - tokenTransferInfoPo.setTime(txTime); - tokenTransferInfoPo.setBlockHeight(blockHeight); - txHashBytes = txHash.getBytes(); - tokenTransferInfoPo.setTxHash(txHashBytes); - tokenTransferInfoPo.setStatus((byte) (execSuccess ? 1 : 2)); - - if (from != null) { - this.refreshTokenBalance(chainId, newestStateRoot, blockHeight, contractAddressInfo, AddressTool.getStringAddressByBytes(from), contractAddress); - this.saveTokenTransferInfo(chainId, from, txHashBytes, new VarInt(i).encode(), tokenTransferInfoPo); - } - if (to != null) { - this.refreshTokenBalance(chainId, newestStateRoot, blockHeight, contractAddressInfo, AddressTool.getStringAddressByBytes(to), contractAddress); - this.saveTokenTransferInfo(chainId, to, txHashBytes, new VarInt(i).encode(), tokenTransferInfoPo); - } - } - } - } catch (Exception e) { - Log.warn("contract event parse error.", e); - throw new RuntimeException(e); - } - } - - public void rollbackNrc20Events(int chainId, Transaction tx, ContractResult contractResult) { - this.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); - } - - public void rollbackNrc20Events(int chainId, NulsHash txHasah, List events) { - try { - byte[] txHashBytes = txHasah.getBytes(); - int size = events.size(); - // 目前只处理Transfer事件, 为了刷新账户的token余额 - String event; - ContractAddressInfoPo contractAddressInfo; - if (events != null && size > 0) { - Map isNRC20Map = new HashMap<>(); - for (int i = size - 1; i >= 0; i--) { - event = events.get(i); - // 按照NRC20标准，TransferEvent事件中第一个参数是转出地址-from，第二个参数是转入地址-to, 第三个参数是金额 - ContractTokenTransferInfoPo tokenTransferInfoPo = ContractUtil.convertJsonToTokenTransferInfoPo(chainId, event); - if (tokenTransferInfoPo == null) { - continue; - } - String contractAddress = tokenTransferInfoPo.getContractAddress(); - if (StringUtils.isBlank(contractAddress)) { - continue; - } - Boolean isNRC20 = isNRC20Map.get(contractAddress); - if (isNRC20 == null) { - byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); - Result contractAddressInfoResult = this.getContractAddressInfo(chainId, contractAddressBytes); - contractAddressInfo = contractAddressInfoResult.getData(); - if (contractAddressInfo == null) { - continue; - } - isNRC20 = contractAddressInfo.isNrc20(); - isNRC20Map.put(contractAddress, isNRC20); - } - // 事件不是NRC20合约的事件 - if (!isNRC20) { - continue; - } - - // 回滚token余额 - this.rollbackContractToken(chainId, tokenTransferInfoPo); - if (tokenTransferInfoPo.getFrom() != null) { - contractTokenTransferStorageService.deleteTokenTransferInfo(chainId, Arrays.concatenate(tokenTransferInfoPo.getFrom(), txHashBytes, new VarInt(i).encode())); - } - if (tokenTransferInfoPo.getTo() != null) { - contractTokenTransferStorageService.deleteTokenTransferInfo(chainId, Arrays.concatenate(tokenTransferInfoPo.getTo(), txHashBytes, new VarInt(i).encode())); - } - - } - } - } catch (Exception e) { - Log.warn("contract event parse error.", e); - throw new RuntimeException(e); - } - } - - public void rollbackContractToken(int chainId, ContractTokenTransferInfoPo po) { - try { - String contractAddressStr = po.getContractAddress(); - byte[] from = po.getFrom(); - byte[] to = po.getTo(); - BigInteger token = po.getValue(); - String fromStr; - String toStr; - ContractTokenBalanceManager contractTokenBalanceManager = getChain(chainId).getContractTokenBalanceManager(); - if (from != null) { - fromStr = AddressTool.getStringAddressByBytes(from); - contractTokenBalanceManager.addContractToken(fromStr, contractAddressStr, token); - } - if (to != null) { - toStr = AddressTool.getStringAddressByBytes(to); - contractTokenBalanceManager.subtractContractToken(toStr, contractAddressStr, token); - } - } catch (Exception e) { - // skip it - Log.error(e); - throw new RuntimeException(e); - } - } - - private void saveTokenTransferInfo(int chainId, byte[] address, byte[] txHashBytes, byte[] index, ContractTokenTransferInfoPo tokenTransferInfoPo) { - contractTokenTransferStorageService.saveTokenTransferInfo(chainId, Arrays.concatenate(address, txHashBytes, index), tokenTransferInfoPo); - } - - public void refreshTokenBalance(int chainId, byte[] stateRoot, long blockHeight, ContractAddressInfoPo po, String address, String contractAddress) { - this.refreshTokenBalance(chainId, null, stateRoot, blockHeight, po, address, contractAddress); - } - - private void refreshTokenBalance(int chainId, ProgramExecutor executor, byte[] stateRoot, long blockHeight, ContractAddressInfoPo po, String address, String contractAddress) { - byte[] contractAddressBytes = po.getContractAddress(); - ProgramResult programResult = this.invokeViewMethod(chainId, executor, stateRoot, blockHeight, contractAddressBytes, NRC20_METHOD_BALANCE_OF, null, address); - if (!programResult.isSuccess()) { - return; - } else { - getChain(chainId).getContractTokenBalanceManager().refreshContractToken(address, contractAddress, po, new BigInteger(programResult.getResult())); - } - - } - public ProgramStatus getContractStatus(int chainId, byte[] stateRoot, byte[] contractAddress) { ProgramExecutor track = getProgramExecutor(chainId).begin(stateRoot); return track.status(contractAddress); @@ -1088,11 +900,6 @@ public Result onCommitForCreateV14(int chainId, BlockHeader blockHeader, Contrac info.setDecimals(tokenDecimals); info.setTotalSupply(tokenTotalSupply); - // 保存NRC20-token地址 - Result result = contractTokenAddressStorageService.saveTokenAddress(chainId, contractAddress); - if (result.isFailed()) { - return result; - } // 调用账本模块，登记资产id，当NRC20合约存在[transferCrossChain]方法时，才登记资产id List methods = this.getAllMethods(chainId, contractCode); boolean isNewNrc20 = false; @@ -1135,12 +942,8 @@ public Result onRollbackForCreateV14(int chainId, byte[] contractAddress, boolea tokenAssetsContractAddressInfoMap.remove(chainId + "-" + tokenAssetsInfo.getAssetId()); } } - //this.rollbackNrc20Events(chainId, tx, contractResult); Result result = contractAddressStorageService.deleteContractAddress(chainId, contractAddress); - if (result.isFailed()) { - return result; - } - return contractTokenAddressStorageService.deleteTokenAddress(chainId, contractAddress); + return result; } public Result onCommitForCreateV16(int chainId, BlockHeader blockHeader, ContractCreate contractCreate, diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java similarity index 98% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java rename to module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java index 7fb3b344c8..1380ad86df 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxFromOtherModuleHandler.java @@ -28,18 +28,15 @@ import io.nuls.base.data.CoinFrom; import io.nuls.base.data.CoinTo; import io.nuls.base.data.Transaction; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.constant.ContractConstant; -import io.nuls.contract.enums.CmdRegisterMode; import io.nuls.contract.manager.ContractTempBalanceManager; import io.nuls.contract.model.bo.ContractBalance; -import io.nuls.contract.model.bo.ContractResult; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.util.MapUtil; import io.nuls.contract.vm.Frame; import io.nuls.contract.vm.program.ProgramAccount; -import io.nuls.contract.vm.program.ProgramInvokeRegisterCmd; import io.nuls.contract.vm.program.ProgramNewTx; import io.nuls.contract.vm.program.impl.ProgramExecutorImpl; import io.nuls.core.core.annotation.Autowired; @@ -63,7 +60,7 @@ public class ContractNewTxFromOtherModuleHandler { @Autowired - private ContractConfig contractConfig; + private NulsCoresConfig contractConfig; /** * 更新临时nonce和vm内维护的合约余额 */ diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java rename to module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTransferHandler.java b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractTransferHandler.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTransferHandler.java rename to module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractTransferHandler.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTxHelper.java b/module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractTxHelper.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractTxHelper.java rename to module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractTxHelper.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ChainManager.java similarity index 84% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/ChainManager.java index abc331cae5..83f0ee8a8d 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ChainManager.java @@ -24,13 +24,12 @@ */ package io.nuls.contract.manager; -import io.nuls.base.protocol.ProtocolLoader; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractDBConstant; import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.config.ConfigBean; -import io.nuls.contract.storage.ConfigStorageService; import io.nuls.contract.util.Log; import io.nuls.contract.util.LogUtil; import io.nuls.contract.util.VMContext; @@ -57,9 +56,7 @@ public class ChainManager { @Autowired private VMContext vmContext; @Autowired - private ConfigStorageService configStorageService; - @Autowired - private ContractConfig contractConfig; + private NulsCoresConfig contractConfig; private Map chainMap = new ConcurrentHashMap<>(); @@ -87,10 +84,6 @@ public void initChain() throws Exception { * 初始化智能合约执行器 */ initContractExecutor(chain); - /* - * 初始化智能合约nrc20-token管理器 - */ - initTokenBalanceManager(chain); /* * 初始化智能合约创建合约未确认交易管理器 */ @@ -100,15 +93,9 @@ public void initChain() throws Exception { */ initContractChainLog(chainId); chainMap.put(chainId, chain); - ProtocolLoader.load(chainId); } } - private void initTokenBalanceManager(Chain chain) { - ContractTokenBalanceManager tokenBalanceManager = ContractTokenBalanceManager.newInstance(chain.getChainId()); - chain.setContractTokenBalanceManager(tokenBalanceManager); - } - private void initContractTxCreateUnconfirmedManager(Chain chain) { ContractTxCreateUnconfirmedManager manager = ContractTxCreateUnconfirmedManager.newInstance(chain.getChainId()); chain.setContractTxCreateUnconfirmedManager(manager); @@ -146,7 +133,7 @@ private Map configChain() { /* 读取数据库链信息配置/Read database chain information configuration */ - Map configMap = configStorageService.getList(); + Map configMap = CommonContext.CONFIG_BEAN_MAP; /* 如果系统是第一次运行，则本地数据库没有存储链信息，此时需要从配置文件读取主链配置信息 If the system is running for the first time, the local database does not have chain information, @@ -156,7 +143,7 @@ private Map configChain() { //String configJson = IoUtils.read(ContractConstant.CONFIG_FILE_PATH); //List configItemList = JSONUtils.json2list(configJson, ConfigItem.class); //ConfigBean configBean = ConfigManager.initManager(configItemList); - ConfigBean configBean = contractConfig.getChainConfig(); + ConfigBean configBean = contractConfig; if (configBean == null) { return null; } @@ -176,16 +163,12 @@ private Map configChain() { * @param chain */ private void initTable(Chain chain) { - int chainId = chain.getConfig().getChainId(); + int chainId = chain.getChainId(); try { // 合约地址表 RocksDBService.createTable(ContractDBConstant.DB_NAME_CONTRACT_ADDRESS + "_" + chainId); // 执行结果表 RocksDBService.createTable(ContractDBConstant.DB_NAME_CONTRACT_EXECUTE_RESULT + "_" + chainId); - // nrc20-token地址表 - RocksDBService.createTable(ContractDBConstant.DB_NAME_CONTRACT_NRC20_TOKEN_ADDRESS + "_" + chainId); - // nrc20-token转账表 - RocksDBService.createTable(ContractDBConstant.DB_NAME_CONTRACT_NRC20_TOKEN_TRANSFER + "_" + chainId); // 合约生成交易离线保存hash关系表 RocksDBService.createTable(ContractDBConstant.DB_NAME_CONTRACT_OFFLINE_TX_HASH_LIST + "_" + chainId); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/CmdRegisterManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/CmdRegisterManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/CmdRegisterManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/CmdRegisterManager.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTempBalanceManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTempBalanceManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTempBalanceManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTempBalanceManager.java diff --git a/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java new file mode 100644 index 0000000000..668cc7b9c7 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java @@ -0,0 +1,224 @@ +///** +// * MIT License +// *

+// * Copyright (c) 2017-2019 nuls.io +// *

+// * Permission is hereby granted, free of charge, to any person obtaining a copy +// * of this software and associated documentation files (the "Software"), to deal +// * in the Software without restriction, including without limitation the rights +// * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// * copies of the Software, and to permit persons to whom the Software is +// * furnished to do so, subject to the following conditions: +// *

+// * The above copyright notice and this permission notice shall be included in all +// * copies or substantial portions of the Software. +// *

+// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// * SOFTWARE. +// */ +//package io.nuls.contract.manager; +// +//import io.nuls.base.basic.AddressTool; +//import io.nuls.base.data.BlockHeader; +//import io.nuls.contract.constant.ContractErrorCode; +//import io.nuls.contract.helper.ContractHelper; +//import io.nuls.contract.model.bo.ContractTokenInfo; +//import io.nuls.contract.model.po.ContractAddressInfoPo; +//import io.nuls.contract.rpc.call.BlockCall; +//import io.nuls.contract.storage.ContractTokenAddressStorageService; +//import io.nuls.core.basic.Result; +//import io.nuls.core.core.ioc.SpringLiteContext; +//import io.nuls.core.exception.NulsException; +// +//import java.math.BigInteger; +//import java.util.*; +//import java.util.concurrent.ConcurrentHashMap; +//import java.util.concurrent.locks.Lock; +//import java.util.concurrent.locks.ReentrantLock; +// +//import static io.nuls.contract.constant.ContractErrorCode.ADDRESS_ERROR; +//import static io.nuls.contract.util.ContractUtil.getSuccess; +// +///** +// * @author: PierreLuo +// * @date: 2019-03-08 +// */ +//public class ContractTokenBalanceManager { +// +// private ContractHelper contractHelper; +// +// private ContractTokenAddressStorageService contractTokenAddressStorageService; +// +// private int chainId; +// +// /** +// * key: String - local account address +// * value: +// * key: String - contract address +// * value: ContractTokenInfo - token name && amount +// */ +// private Map> contractTokenOfLocalAccount = new ConcurrentHashMap<>(); +// +// private Lock tokenLock = new ReentrantLock(); +// +// private Set initializedAddressSet; +// +// public static ContractTokenBalanceManager newInstance(int chainId) { +// ContractTokenBalanceManager manager = new ContractTokenBalanceManager(); +// manager.chainId = chainId; +// manager.contractHelper = SpringLiteContext.getBean(ContractHelper.class); +// manager.contractTokenAddressStorageService = SpringLiteContext.getBean(ContractTokenAddressStorageService.class); +// manager.initializedAddressSet = ConcurrentHashMap.newKeySet(); +// return manager; +// } +// +// private ContractTokenBalanceManager() { +// } +// +// public Result initAllTokensByImportAccount(String account) throws NulsException { +// initializedAddressSet.remove(account); +// return this.initAllTokensByAccount(account); +// } +// +// private Result initAllTokensByAccount(String account) throws NulsException { +// if (!initializedAddressSet.add(account)) { +// return getSuccess(); +// } +// if (!AddressTool.validAddress(chainId, account)) { +// return Result.getFailed(ADDRESS_ERROR); +// } +// Result> allNrc20ListResult = contractTokenAddressStorageService.getAllNrc20AddressList(chainId); +// if (allNrc20ListResult.isFailed()) { +// return allNrc20ListResult; +// } +// BlockHeader blockHeader = BlockCall.getLatestBlockHeader(chainId); +// List contractAddressInfoPoList = allNrc20ListResult.getData(); +// for (byte[] address : contractAddressInfoPoList) { +// initialContractToken(account, blockHeader, AddressTool.getStringAddressByBytes(address)); +// } +// +// return getSuccess(); +// } +// +// public void initialContractToken(String account, BlockHeader blockHeader, String contract) { +// tokenLock.lock(); +// try { +// Result result = contractHelper.getContractToken(chainId, blockHeader, account, contract); +// if (result.isFailed()) { +// return; +// } +// ContractTokenInfo tokenInfo = result.getData(); +// BigInteger amount = tokenInfo.getAmount(); +// if (amount == null || amount.equals(BigInteger.ZERO)) { +// return; +// } +// Map tokens = contractTokenOfLocalAccount.get(account); +// if (tokens == null) { +// tokens = new HashMap<>(); +// } +// tokens.put(contract, tokenInfo); +// contractTokenOfLocalAccount.put(account, tokens); +// } finally { +// tokenLock.unlock(); +// } +// } +// +// public void refreshContractToken(String account, String contract, ContractAddressInfoPo po, BigInteger value) { +// tokenLock.lock(); +// try { +// ContractTokenInfo tokenInfo = new ContractTokenInfo(contract, po.getNrc20TokenName(), po.getDecimals(), value, po.getNrc20TokenSymbol(), po.getBlockHeight()); +// Map tokens = contractTokenOfLocalAccount.get(account); +// if (tokens == null) { +// tokens = new HashMap<>(); +// } +// tokens.put(contract, tokenInfo); +// contractTokenOfLocalAccount.put(account, tokens); +// } finally { +// tokenLock.unlock(); +// } +// } +// +// public Result> getAllTokensByAccount(String account) throws NulsException { +// Result result = this.initAllTokensByAccount(account); +// if (result.isFailed()) { +// return result; +// } +// Map tokensMap = contractTokenOfLocalAccount.get(account); +// if (tokensMap == null || tokensMap.size() == 0) { +// return getSuccess().setData(new ArrayList<>()); +// } +// List resultList = new ArrayList<>(); +// Set> entries = tokensMap.entrySet(); +// String contractAddress; +// ContractTokenInfo info; +// for (Map.Entry entry : entries) { +// contractAddress = entry.getKey(); +// info = entry.getValue(); +// info.setContractAddress(contractAddress); +// resultList.add(info); +// } +// return getSuccess().setData(resultList); +// } +// +// +// public Result subtractContractToken(String account, String contract, BigInteger token) { +// tokenLock.lock(); +// try { +// Map tokens = contractTokenOfLocalAccount.get(account); +// if (tokens == null) { +// return getSuccess(); +// } else { +// ContractTokenInfo info = tokens.get(contract); +// if (info == null) { +// return getSuccess(); +// } +// BigInteger currentToken = info.getAmount(); +// if (currentToken == null) { +// return getSuccess(); +// } else { +// if (currentToken.compareTo(token) < 0) { +// return Result.getFailed(ContractErrorCode.INSUFFICIENT_TOKEN_BALANCE); +// } +// currentToken = currentToken.subtract(token); +// tokens.put(contract, info.setAmount(currentToken)); +// } +// } +// return getSuccess(); +// } finally { +// tokenLock.unlock(); +// } +// } +// +// public Result addContractToken(String account, String contract, BigInteger token) { +// tokenLock.lock(); +// try { +// Map tokens = contractTokenOfLocalAccount.get(account); +// do { +// if (tokens == null) { +// break; +// } else { +// ContractTokenInfo info = tokens.get(contract); +// if (info == null) { +// return getSuccess(); +// } +// BigInteger currentToken = info.getAmount(); +// if (currentToken == null) { +// break; +// } else { +// currentToken = currentToken.add(token); +// tokens.put(contract, info.setAmount(currentToken)); +// } +// } +// } while (false); +// } finally { +// tokenLock.unlock(); +// } +// return getSuccess(); +// } +// +//} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxCreateUnconfirmedManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTxCreateUnconfirmedManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxCreateUnconfirmedManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTxCreateUnconfirmedManager.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxProcessorManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTxProcessorManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxProcessorManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTxProcessorManager.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/ContractTxValidatorManager.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/interfaces/RequestAndResponseInterface.java b/module/nuls-cores/src/main/java/io/nuls/contract/manager/interfaces/RequestAndResponseInterface.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/interfaces/RequestAndResponseInterface.java rename to module/nuls-cores/src/main/java/io/nuls/contract/manager/interfaces/RequestAndResponseInterface.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/AnalyzerResult.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/AnalyzerResult.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/AnalyzerResult.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/AnalyzerResult.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/BatchInfo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/BatchInfo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/BatchInfo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/BatchInfo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/BatchInfoV8.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/BatchInfoV8.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/BatchInfoV8.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/BatchInfoV8.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/CallableResult.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/CallableResult.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/CallableResult.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/CallableResult.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/CallerResult.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/CallerResult.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/CallerResult.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/CallerResult.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/Chain.java similarity index 92% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/Chain.java index 66dc9a4929..246ffbe44a 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Chain.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/Chain.java @@ -1,9 +1,8 @@ package io.nuls.contract.model.bo; +import io.nuls.common.ConfigBean; import io.nuls.contract.enums.BlockType; -import io.nuls.contract.manager.ContractTokenBalanceManager; import io.nuls.contract.manager.ContractTxCreateUnconfirmedManager; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.util.Log; import io.nuls.contract.vm.program.ProgramExecutor; import org.ethereum.config.CommonConfig; @@ -43,11 +42,6 @@ public class Chain { private CommonConfig commonConfig; private DefaultConfig defaultConfig; - /** - * 智能合约token余额管理 - */ - private ContractTokenBalanceManager contractTokenBalanceManager; - /** * 智能合约创建合约未确认交易管理器 */ @@ -132,14 +126,6 @@ public void setDefaultConfig(DefaultConfig defaultConfig) { this.defaultConfig = defaultConfig; } - public ContractTokenBalanceManager getContractTokenBalanceManager() { - return contractTokenBalanceManager; - } - - public void setContractTokenBalanceManager(ContractTokenBalanceManager contractTokenBalanceManager) { - this.contractTokenBalanceManager = contractTokenBalanceManager; - } - public ContractTxCreateUnconfirmedManager getContractTxCreateUnconfirmedManager() { return contractTxCreateUnconfirmedManager; } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/CmdRegister.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/CmdRegister.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/CmdRegister.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/CmdRegister.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractBalance.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractBalance.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractBalance.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractBalance.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractContainer.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractContainer.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractContainer.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractContainer.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractCreate.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractCreate.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractCreate.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractMergedTransfer.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractMergedTransfer.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractMergedTransfer.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractMergedTransfer.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractMultyAssetMergedTransfer.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractMultyAssetMergedTransfer.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractMultyAssetMergedTransfer.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractMultyAssetMergedTransfer.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractResult.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractResult.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractResult.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTempTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractTempTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTempTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractTempTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenAssetsInfo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractTokenAssetsInfo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenAssetsInfo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractTokenAssetsInfo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractTokenInfo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractWrapperTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractWrapperTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ContractWrapperTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractWrapperTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ModelWrapper.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ModelWrapper.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/ModelWrapper.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ModelWrapper.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/MultyAssetOutput.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/MultyAssetOutput.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/MultyAssetOutput.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/MultyAssetOutput.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Output.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/bo/Output.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/Output.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/bo/Output.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/AccountAmountDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/BlockHeaderDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/BlockHeaderDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/BlockHeaderDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/BlockHeaderDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/CallContractDataDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/CallContractDataDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/CallContractDataDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/CallContractDataDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/CmdRegisterDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/CmdRegisterDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/CmdRegisterDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/CmdRegisterDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractAddressDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractAddressDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractAddressDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractAddressDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractConstructorInfoDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractConstructorInfoDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractConstructorInfoDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractConstructorInfoDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInfoDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInvokeRegisterCmdDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInvokeRegisterCmdDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractInvokeRegisterCmdDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInvokeRegisterCmdDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractMergedTransferDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractMergedTransferDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractMergedTransferDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractMergedTransferDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractMultyAssetMergedTransferDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractMultyAssetMergedTransferDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractMultyAssetMergedTransferDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractMultyAssetMergedTransferDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractOutputDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractOutputDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractOutputDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractOutputDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractPackageDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractPackageDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractPackageDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractPackageDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractResultDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractToken721TransferDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenInfoDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferInfo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferTransactionDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferTransactionDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferTransactionDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTokenTransferTransactionDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTransactionDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTransactionDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTransactionDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTransactionDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTransferDataDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTransferDataDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTransferDataDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTransferDataDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTxRegisterDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTxRegisterDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ContractTxRegisterDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractTxRegisterDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/CreateContractDataDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/CreateContractDataDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/CreateContractDataDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/CreateContractDataDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/DeleteContractDataDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/DeleteContractDataDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/DeleteContractDataDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/DeleteContractDataDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/InputDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/InputDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/InputDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/InputDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ModuleCmdRegisterDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ModuleCmdRegisterDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/ModuleCmdRegisterDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ModuleCmdRegisterDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/MultyAssetOutputDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/MultyAssetOutputDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/MultyAssetOutputDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/MultyAssetOutputDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/OutputDto.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/dto/OutputDto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/dto/OutputDto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/dto/OutputDto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractAddressInfoPo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractAddressInfoPo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractAddressInfoPo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractAddressInfoPo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractCollectionInfoPo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractCollectionInfoPo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractCollectionInfoPo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractCollectionInfoPo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractOfflineTxHashPo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractOfflineTxHashPo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractOfflineTxHashPo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractOfflineTxHashPo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractTokenTransferInfoPo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractTokenTransferInfoPo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/ContractTokenTransferInfoPo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/po/ContractTokenTransferInfoPo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/TransactionInfoPo.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/po/TransactionInfoPo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/po/TransactionInfoPo.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/po/TransactionInfoPo.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/CallContractTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/CallContractTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/CallContractTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/CallContractTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/ContractBaseTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/ContractBaseTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/ContractBaseTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/ContractBaseTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/ContractReturnGasTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/ContractReturnGasTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/ContractReturnGasTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/ContractReturnGasTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/ContractTransferTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/ContractTransferTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/ContractTransferTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/ContractTransferTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/CreateContractTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/CreateContractTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/CreateContractTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/CreateContractTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/CrossTokenContractTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/CrossTokenContractTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/CrossTokenContractTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/CrossTokenContractTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/DeleteContractTransaction.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/tx/DeleteContractTransaction.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/tx/DeleteContractTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/tx/DeleteContractTransaction.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/CallContractData.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/CallContractData.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/CallContractData.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/CallContractData.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/ContractData.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/ContractData.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/ContractData.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/ContractData.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/ContractTransferData.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/ContractTransferData.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/ContractTransferData.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/ContractTransferData.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/CreateContractData.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/CreateContractData.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/CreateContractData.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/CreateContractData.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/DeleteContractData.java b/module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/DeleteContractData.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/model/txdata/DeleteContractData.java rename to module/nuls-cores/src/main/java/io/nuls/contract/model/txdata/DeleteContractData.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java similarity index 65% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java index 99b98693f6..1a0e58bf92 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java @@ -34,20 +34,15 @@ import io.nuls.contract.model.dto.CallContractDataDto; import io.nuls.contract.model.dto.ContractResultDto; import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.txdata.CallContractData; import io.nuls.contract.model.txdata.ContractData; import io.nuls.contract.service.ContractService; -import io.nuls.contract.storage.ContractTokenTransferStorageService; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; -import io.nuls.contract.vm.program.ProgramStatus; import io.nuls.core.basic.Result; -import io.nuls.core.basic.VarInt; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.parse.JSONUtils; -import org.bouncycastle.util.Arrays; import java.util.HashMap; import java.util.List; @@ -66,16 +61,12 @@ public class CallContractTxProcessor { @Autowired private ContractHelper contractHelper; - @Autowired - private ContractTokenTransferStorageService contractTokenTransferStorageService; - @Autowired private ContractService contractService; public Result onCommit(int chainId, ContractWrapperTransaction tx) { try { BlockHeader blockHeader = contractHelper.getBatchInfoCurrentBlockHeader(chainId); - byte[] stateRoot = blockHeader.getStateRoot(); long blockHeight = blockHeader.getHeight(); ContractResult contractResult = tx.getContractResult(); contractResult.setBlockHeight(blockHeight); @@ -88,45 +79,6 @@ public Result onCommit(int chainId, ContractWrapperTransaction tx) { ContractAddressInfoPo contractAddressInfoPo = contractAddressInfoPoResult.getData(); contractResult.setNrc20(contractAddressInfoPo.isNrc20()); tx.setBlockHeight(blockHeight); - // 获取合约当前状态 - ProgramStatus status = contractHelper.getContractStatus(chainId, stateRoot, contractAddress); - boolean isTerminatedContract = ContractUtil.isTerminatedContract(status.ordinal()); - - // 处理合约执行失败 - 没有transferEvent的情况, 直接从数据库中获取, 若是本地创建的交易，获取到修改为失败交易 - if (isTerminatedContract || !contractResult.isSuccess()) { - if (contractAddressInfoPo != null && contractAddressInfoPo.isNrc20() && ContractUtil.isTransferMethod(callContractData.getMethodName())) { - byte[] txHashBytes = tx.getHash().getBytes(); - byte[] infoKey = Arrays.concatenate(callContractData.getSender(), txHashBytes, new VarInt(0).encode()); - Result infoResult = contractTokenTransferStorageService.getTokenTransferInfo(chainId, infoKey); - ContractTokenTransferInfoPo po = infoResult.getData(); - if (po != null) { - po.setStatus((byte) 2); - contractTokenTransferStorageService.saveTokenTransferInfo(chainId, infoKey, po); - - // 刷新token余额 - if (isTerminatedContract) { - // 终止的合约，回滚token余额 - contractHelper.rollbackContractToken(chainId, po); - contractResult.setError(true); - contractResult.setErrorMessage("this contract has been terminated"); - } else { - - if (po.getFrom() != null) { - contractHelper.refreshTokenBalance(chainId, stateRoot, blockHeight, contractAddressInfoPo, AddressTool.getStringAddressByBytes(po.getFrom()), po.getContractAddress()); - } - if (po.getTo() != null) { - contractHelper.refreshTokenBalance(chainId, stateRoot, blockHeight, contractAddressInfoPo, AddressTool.getStringAddressByBytes(po.getTo()), po.getContractAddress()); - } - } - } - } - } - - if (!isTerminatedContract) { - // 处理合约事件 - contractHelper.dealNrc20Events(chainId, stateRoot, tx, contractResult, contractAddressInfoPo); - } - // 保存合约执行结果 return contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); } catch (Exception e) { @@ -151,7 +103,6 @@ public Result onRollback(int chainId, ContractWrapperTransaction tx) { } catch (Exception e) { Log.warn("failed to trace call rollback log, error is {}", e.getMessage()); } - contractHelper.rollbackNrc20Events(chainId, tx, contractResult); // 删除合约执行结果 return contractService.deleteContractExecuteResult(chainId, tx.getHash()); } catch (Exception e) { @@ -163,7 +114,6 @@ public Result onRollback(int chainId, ContractWrapperTransaction tx) { public Result onCommitV8(int chainId, ContractWrapperTransaction tx) { try { BlockHeader blockHeader = contractHelper.getBatchInfoCurrentBlockHeaderV8(chainId); - byte[] stateRoot = blockHeader.getStateRoot(); long blockHeight = blockHeader.getHeight(); ContractResult contractResult = tx.getContractResult(); contractResult.setBlockHeight(blockHeight); @@ -176,45 +126,6 @@ public Result onCommitV8(int chainId, ContractWrapperTransaction tx) { ContractAddressInfoPo contractAddressInfoPo = contractAddressInfoPoResult.getData(); contractResult.setNrc20(contractAddressInfoPo.isNrc20()); tx.setBlockHeight(blockHeight); - // 获取合约当前状态 - ProgramStatus status = contractHelper.getContractStatus(chainId, stateRoot, contractAddress); - boolean isTerminatedContract = ContractUtil.isTerminatedContract(status.ordinal()); - - // 处理合约执行失败 - 没有transferEvent的情况, 直接从数据库中获取, 若是本地创建的交易，获取到修改为失败交易 - if (isTerminatedContract || !contractResult.isSuccess()) { - if (contractAddressInfoPo != null && contractAddressInfoPo.isNrc20() && ContractUtil.isTransferMethod(callContractData.getMethodName())) { - byte[] txHashBytes = tx.getHash().getBytes(); - byte[] infoKey = Arrays.concatenate(callContractData.getSender(), txHashBytes, new VarInt(0).encode()); - Result infoResult = contractTokenTransferStorageService.getTokenTransferInfo(chainId, infoKey); - ContractTokenTransferInfoPo po = infoResult.getData(); - if (po != null) { - po.setStatus((byte) 2); - contractTokenTransferStorageService.saveTokenTransferInfo(chainId, infoKey, po); - - // 刷新token余额 - if (isTerminatedContract) { - // 终止的合约，回滚token余额 - contractHelper.rollbackContractToken(chainId, po); - contractResult.setError(true); - contractResult.setErrorMessage("this contract has been terminated"); - } else { - - if (po.getFrom() != null) { - contractHelper.refreshTokenBalance(chainId, stateRoot, blockHeight, contractAddressInfoPo, AddressTool.getStringAddressByBytes(po.getFrom()), po.getContractAddress()); - } - if (po.getTo() != null) { - contractHelper.refreshTokenBalance(chainId, stateRoot, blockHeight, contractAddressInfoPo, AddressTool.getStringAddressByBytes(po.getTo()), po.getContractAddress()); - } - } - } - } - } - - if (!isTerminatedContract) { - // 处理合约事件 - contractHelper.dealNrc20Events(chainId, stateRoot, tx, contractResult, contractAddressInfoPo); - } - // 保存合约执行结果 return contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); } catch (Exception e) { @@ -239,7 +150,6 @@ public Result onRollbackV8(int chainId, ContractWrapperTransaction tx) { } catch (Exception e) { Log.warn("failed to trace call rollback log, error is {}", e.getMessage()); } - contractHelper.rollbackNrc20Events(chainId, tx, contractResult); // 删除合约执行结果 return contractService.deleteContractExecuteResult(chainId, tx.getHash()); } catch (Exception e) { @@ -280,9 +190,6 @@ public Result onCommitV14(int chainId, ContractWrapperTransaction tx) { } } } - // 处理合约事件 - contractHelper.dealNrc20Events(chainId, stateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); - // 保存合约执行结果 return contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); } catch (Exception e) { @@ -307,7 +214,6 @@ public Result onRollbackV14(int chainId, ContractWrapperTransaction tx) { } catch (Exception e) { Log.warn("failed to trace call rollback log, error is {}", e.getMessage()); } - contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); // 处理内部创建合约 List internalCreates = contractResult.getInternalCreates(); if (internalCreates != null && !internalCreates.isEmpty()) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java similarity index 91% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java index 8e30516a5b..ed45cc3196 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/processor/CreateContractTxProcessor.java @@ -42,7 +42,6 @@ import io.nuls.contract.service.ContractService; import io.nuls.contract.service.ContractTxService; import io.nuls.contract.storage.ContractAddressStorageService; -import io.nuls.contract.storage.ContractTokenAddressStorageService; import io.nuls.contract.util.Log; import io.nuls.contract.vm.program.ProgramMethod; import io.nuls.core.basic.Result; @@ -68,8 +67,6 @@ public class CreateContractTxProcessor { @Autowired private ContractAddressStorageService contractAddressStorageService; @Autowired - private ContractTokenAddressStorageService contractTokenAddressStorageService; - @Autowired private ContractService contractService; @Autowired private ContractTxService contractTxService; @@ -126,14 +123,6 @@ public Result onCommit(int chainId, ContractWrapperTransaction tx) throws Except info.setNrc20TokenSymbol(tokenSymbol); info.setDecimals(tokenDecimals); info.setTotalSupply(tokenTotalSupply); - byte[] newestStateRoot = blockHeader.getStateRoot(); - //处理NRC20合约事件 - contractHelper.dealNrc20Events(chainId, newestStateRoot, tx, contractResult, info); - // 保存NRC20-token地址 - Result result = contractTokenAddressStorageService.saveTokenAddress(chainId, contractAddress); - if (result.isFailed()) { - return result; - } // add by pierre at 2019-11-02 调用账本模块，登记资产id，当NRC20合约存在[transferCrossChain]方法时，才登记资产id 需要协议升级 done if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_V250 ) { List methods = contractHelper.getAllMethods(chainId, txData.getCode()); @@ -195,15 +184,10 @@ public Result onRollback(int chainId, ContractWrapperTransaction tx) throws Exce } } // end code by pierre - contractHelper.rollbackNrc20Events(chainId, tx, contractResult); Result result = contractAddressStorageService.deleteContractAddress(chainId, contractAddress); if (result.isFailed()) { return result; } - result = contractTokenAddressStorageService.deleteTokenAddress(chainId, contractAddress); - if (result.isFailed()) { - return result; - } return contractService.deleteContractExecuteResult(chainId, tx.getHash()); } @@ -262,14 +246,6 @@ public Result onCommitV8(int chainId, ContractWrapperTransaction tx) throws Exce // 处理NRC20 token数据 info.setDecimals(tokenDecimals); info.setTotalSupply(tokenTotalSupply); - byte[] newestStateRoot = blockHeader.getStateRoot(); - //处理NRC20合约事件 - contractHelper.dealNrc20Events(chainId, newestStateRoot, tx, contractResult, info); - // 保存NRC20-token地址 - Result result = contractTokenAddressStorageService.saveTokenAddress(chainId, contractAddress); - if (result.isFailed()) { - return result; - } // add by pierre at 2019-11-02 调用账本模块，登记资产id，当NRC20合约存在[transferCrossChain]方法时，才登记资产id 需要协议升级 done if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_V250 ) { List methods = contractHelper.getAllMethods(chainId, txData.getCode()); @@ -332,15 +308,10 @@ public Result onRollbackV8(int chainId, ContractWrapperTransaction tx) throws Ex } } // end code by pierre - contractHelper.rollbackNrc20Events(chainId, tx, contractResult); Result result = contractAddressStorageService.deleteContractAddress(chainId, contractAddress); if (result.isFailed()) { return result; } - result = contractTokenAddressStorageService.deleteTokenAddress(chainId, contractAddress); - if (result.isFailed()) { - return result; - } return contractService.deleteContractExecuteResult(chainId, tx.getHash()); } @@ -364,7 +335,6 @@ public Result onCommitV14(int chainId, ContractWrapperTransaction tx) throws Exc byte[] sender = txData.getSender(); String alias = txData.getAlias(); byte[] code = txData.getCode(); - byte[] newestStateRoot = blockHeader.getStateRoot(); ContractCreate create = new ContractCreate(); create.setTokenType(contractResult.getTokenType()); @@ -375,11 +345,6 @@ public Result onCommitV14(int chainId, ContractWrapperTransaction tx) throws Exc create.setAcceptDirectTransfer(contractResult.isAcceptDirectTransfer()); Map infoPoMap = new HashMap<>(); Result result = contractHelper.onCommitForCreateV14(chainId, blockHeader, create, tx.getHash(), tx.getTime(), contractAddress, sender, code, alias, infoPoMap); - if (result.isFailed()) { - return result; - } - //处理NRC20合约事件 - contractHelper.dealNrc20Events(chainId, newestStateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); return result; } @@ -400,7 +365,6 @@ public Result onRollbackV14(int chainId, ContractWrapperTransaction tx) throws E } catch (Exception e) { Log.warn("failed to trace create rollback log, error is {}", e.getMessage()); } - contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); Result result = contractHelper.onRollbackForCreateV14(chainId, contractAddress, contractResult.isNrc20()); if (result.isFailed()) { return result; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/DeleteContractTxProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/processor/DeleteContractTxProcessor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/processor/DeleteContractTxProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/processor/DeleteContractTxProcessor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/CallHelper.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/CallHelper.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/CallHelper.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/CallHelper.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/AccountCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/AccountCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/AccountCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/AccountCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/BlockCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/BlockCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/BlockCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/BlockCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/ChainManagerCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ConsensusCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/ConsensusCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/ConsensusCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/ConsensusCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/LedgerCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/LedgerCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/LedgerCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/LedgerCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/TransactionCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/TransactionCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/call/TransactionCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/call/TransactionCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java similarity index 96% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java index bb10c0bc45..46059685df 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/cmd/ContractCmd.java @@ -30,12 +30,15 @@ import io.nuls.base.data.CoinTo; import io.nuls.base.data.Transaction; import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.config.ContractContext; import io.nuls.contract.enums.BlockType; import io.nuls.contract.enums.CmdRegisterMode; import io.nuls.contract.helper.ContractHelper; -import io.nuls.contract.manager.*; +import io.nuls.contract.manager.ChainManager; +import io.nuls.contract.manager.CmdRegisterManager; +import io.nuls.contract.manager.ContractTxProcessorManager; +import io.nuls.contract.manager.ContractTxValidatorManager; import io.nuls.contract.model.bo.BatchInfo; import io.nuls.contract.model.bo.ContractTempTransaction; import io.nuls.contract.model.dto.ContractPackageDto; @@ -74,6 +77,7 @@ * @date: 2019-03-11 */ @Component +@NulsCoresCmd(module = ModuleE.SC) public class ContractCmd extends BaseCmd { @Autowired @@ -87,7 +91,7 @@ public class ContractCmd extends BaseCmd { @Autowired private CmdRegisterManager cmdRegisterManager; @Autowired - private ContractConfig contractConfig; + private NulsCoresConfig contractConfig; @CmdAnnotation(cmd = BATCH_BEGIN, version = 1.0, description = "执行合约一个批次的开始通知，生成当前批次的信息/batch begin") @Parameters(value = { @@ -442,38 +446,6 @@ public Response contractOfflineTxList(Map params) { } } - @CmdAnnotation(cmd = INITIAL_ACCOUNT_TOKEN, version = 1.0, description = "初始化账户token信息，节点导入账户时调用/initial account token") - @Parameters(value = { - @Parameter(parameterName = "chainId", parameterType = "int", parameterDes = "链id"), - @Parameter(parameterName = "address", parameterType = "String", parameterDes = "账户地址") - }) - @ResponseData(description = "无特定返回值，没有错误即成功") - public Response initialAccountToken(Map params) { - try { - Integer chainId = (Integer) params.get("chainId"); - ChainManager.chainHandle(chainId); - String address = (String) params.get("address"); - if (!AddressTool.validAddress(chainId, address)) { - return failed(ADDRESS_ERROR); - } - - ContractTokenBalanceManager contractTokenBalanceManager = contractHelper.getChain(chainId).getContractTokenBalanceManager(); - if (contractTokenBalanceManager == null) { - return failed(DATA_ERROR); - } - - Result result = contractTokenBalanceManager.initAllTokensByImportAccount(address); - if (result.isFailed()) { - return wrapperFailed(result); - } - - return success(); - } catch (Exception e) { - Log.error(e); - return failed(e.getMessage()); - } - } - /** * 其他模块向合约模块注册可被合约调用的命令 * diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java similarity index 99% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java index 395e264aae..34b0cd199b 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/cmd/ContractTransactionHandler.java @@ -22,6 +22,7 @@ import static io.nuls.core.constant.TxType.*; @Service +@NulsCoresCmd(module = ModuleE.SC) public class ContractTransactionHandler extends BaseCmd { @Autowired diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java similarity index 91% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java rename to module/nuls-cores/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java index 5670a90be3..f6a449ef19 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/rpc/resource/ContractResource.java @@ -34,25 +34,21 @@ import io.nuls.contract.enums.TokenTypeStatus; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.manager.ChainManager; -import io.nuls.contract.manager.ContractTokenBalanceManager; import io.nuls.contract.model.bo.ContractResult; import io.nuls.contract.model.bo.ContractTokenInfo; import io.nuls.contract.model.dto.*; import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.tx.ContractBaseTransaction; import io.nuls.contract.rpc.call.BlockCall; import io.nuls.contract.rpc.call.TransactionCall; import io.nuls.contract.service.ContractService; import io.nuls.contract.service.ContractTxService; import io.nuls.contract.storage.ContractAddressStorageService; -import io.nuls.contract.storage.ContractTokenTransferStorageService; import io.nuls.contract.util.ContractLedgerUtil; import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.util.MapUtil; import io.nuls.contract.vm.program.*; -import io.nuls.contract.vm.util.Utils; import io.nuls.core.basic.Page; import io.nuls.core.basic.Result; import io.nuls.core.constant.BaseConstant; @@ -87,6 +83,7 @@ * @date: 2019-03-11 */ @Component +@NulsCoresCmd(module = ModuleE.SC) public class ContractResource extends BaseCmd { @Autowired @@ -96,8 +93,6 @@ public class ContractResource extends BaseCmd { @Autowired private ContractTxService contractTxService; @Autowired - private ContractTokenTransferStorageService contractTokenTransferStorageService; - @Autowired private ContractAddressStorageService contractAddressStorageService; @CmdAnnotation(cmd = CREATE, version = 1.0, description = "发布合约/create contract") @@ -1468,160 +1463,6 @@ private void calTransactionValue(ContractTransactionDto txDto) { txDto.setValue(bigInteger2String(value)); } - @CmdAnnotation(cmd = TOKEN_ASSETS_LIST, version = 1.0, description = "token资产集合/token assets list") - @Parameters(value = { - @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), - @Parameter(parameterName = "address", parameterDes = "账户地址"), - @Parameter(parameterName = "pageNumber", requestType = @TypeDescriptor(value = int.class), parameterDes = "页码", canNull = true), - @Parameter(parameterName = "pageSize", requestType = @TypeDescriptor(value = int.class), parameterDes = "每页大小", canNull = true) - }) - @ResponseData(name = "返回值", description = "返回一个Page对象，这里只描述Page对象中的集合", - responseType = @TypeDescriptor(value = List.class, collectionElement = ContractTokenInfoDto.class) - ) - public Response tokenAssetsList(Map params) { - try { - Integer chainId = (Integer) params.get("chainId"); - ChainManager.chainHandle(chainId); - String address = (String) params.get("address"); - Integer pageNumber = (Integer) params.get("pageNumber"); - Integer pageSize = (Integer) params.get("pageSize"); - - if (null == pageNumber || pageNumber == 0) { - pageNumber = 1; - } - if (null == pageSize || pageSize == 0) { - pageSize = 10; - } - if (pageNumber < 0 || pageSize < 0 || pageSize > 100) { - return failed(PARAMETER_ERROR); - } - - if (!AddressTool.validAddress(chainId, address)) { - return failed(ADDRESS_ERROR); - } - - ContractTokenBalanceManager tokenBalanceManager = contractHelper.getChain(chainId).getContractTokenBalanceManager(); - Result> tokenListResult = tokenBalanceManager.getAllTokensByAccount(address); - if (tokenListResult.isFailed()) { - return wrapperFailed(tokenListResult); - } - - List tokenInfoList = tokenListResult.getData(); - - List tokenInfoDtoList = new ArrayList<>(); - Page page = new Page<>(pageNumber, pageSize, tokenInfoList.size()); - int start = pageNumber * pageSize - pageSize; - if (start >= page.getTotal()) { - return success(page); - } - - int end = start + pageSize; - if (end > page.getTotal()) { - end = (int) page.getTotal(); - } - - if (tokenInfoList.size() > 0) { - for (int i = start; i < end; i++) { - ContractTokenInfo info = tokenInfoList.get(i); - tokenInfoDtoList.add(new ContractTokenInfoDto(info)); - } - } - if (tokenInfoDtoList != null && tokenInfoDtoList.size() > 0) { - BlockHeader blockHeader = BlockCall.getLatestBlockHeader(chainId); - byte[] prevStateRoot = ContractUtil.getStateRoot(blockHeader); - ProgramExecutor track = contractHelper.getProgramExecutor(chainId).begin(prevStateRoot); - for (ContractTokenInfoDto tokenInfo : tokenInfoDtoList) { - tokenInfo.setStatus(track.status(AddressTool.getAddress(tokenInfo.getContractAddress())).ordinal()); - } - } - page.setList(tokenInfoDtoList); - - return success(page); - } catch (NulsException e) { - Log.error(e); - return failed(e.getErrorCode()); - } - } - - @CmdAnnotation(cmd = TOKEN_TRANSFER_LIST, version = 1.0, description = "token转账交易列表/token transfer list") - @Parameters(value = { - @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), - @Parameter(parameterName = "address", parameterDes = "账户地址"), - @Parameter(parameterName = "pageNumber", requestType = @TypeDescriptor(value = int.class), parameterDes = "页码", canNull = true), - @Parameter(parameterName = "pageSize", requestType = @TypeDescriptor(value = int.class), parameterDes = "每页大小", canNull = true) - }) - @ResponseData(name = "返回值", description = "返回一个Page对象，这里只描述Page对象中的集合", - responseType = @TypeDescriptor(value = List.class, collectionElement = ContractTokenTransferTransactionDto.class) - ) - public Response tokenTransferList(Map params) { - try { - Integer chainId = (Integer) params.get("chainId"); - ChainManager.chainHandle(chainId); - String address = (String) params.get("address"); - Integer pageNumber = (Integer) params.get("pageNumber"); - Integer pageSize = (Integer) params.get("pageSize"); - - if (null == pageNumber || pageNumber == 0) { - pageNumber = 1; - } - if (null == pageSize || pageSize == 0) { - pageSize = 10; - } - if (pageNumber < 0 || pageSize < 0 || pageSize > 100) { - return failed(PARAMETER_ERROR); - } - - if (!AddressTool.validAddress(chainId, address)) { - return failed(ADDRESS_ERROR); - } - byte[] addressBytes = AddressTool.getAddress(address); - - Result> tokenTransferInfoListResult = contractTxService.getTokenTransferInfoList(chainId, address); - if (tokenTransferInfoListResult.isFailed()) { - return wrapperFailed(tokenTransferInfoListResult); - } - - List list = tokenTransferInfoListResult.getData(); - if (list == null) { - list = new ArrayList<>(); - } - if (list.size() > 0) { - list.sort(new Comparator() { - @Override - public int compare(ContractTokenTransferInfoPo o1, ContractTokenTransferInfoPo o2) { - return o1.compareTo(o2.getTime()); - } - }); - } - - List result = new ArrayList<>(); - Page page = new Page<>(pageNumber, pageSize, list.size()); - int start = pageNumber * pageSize - pageSize; - if (start >= page.getTotal()) { - return success(page); - } - - int end = start + pageSize; - if (end > page.getTotal()) { - end = (int) page.getTotal(); - } - - ContractTokenTransferInfoPo info; - for (int i = start; i < end; i++) { - info = list.get(i); - result.add(new ContractTokenTransferTransactionDto(info, addressBytes)); - } - - page.setList(result); - - return success(page); - } catch (Exception e) { - Log.error(e); - return failed(e.getMessage()); - } - } - - @CmdAnnotation(cmd = ACCOUNT_CONTRACTS, version = 1.0, description = "账户的合约地址列表/account contract list") @Parameters(value = { @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID"), diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractCaller.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/ContractCaller.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractCaller.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/ContractCaller.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractExecutor.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/ContractExecutor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractExecutor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/ContractExecutor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractService.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/ContractService.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractService.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/ContractService.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/ContractTxService.java similarity index 96% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/ContractTxService.java index 9ea27d63a7..9f4fe9950d 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ContractTxService.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/service/ContractTxService.java @@ -57,5 +57,4 @@ Result previewContractCallTx(int chainId, byte[] senderBytes, Bi Result validateContractDeleteTx(int chainId, String sender, String contractAddress); - Result> getTokenTransferInfoList(int chainId, String address); } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ResultAnalyzer.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/ResultAnalyzer.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ResultAnalyzer.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/ResultAnalyzer.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ResultHanlder.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/ResultHanlder.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/ResultHanlder.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/ResultHanlder.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractCallerImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractExecutorImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractServiceImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java similarity index 64% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java index 54abef56dd..77d400413a 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java @@ -26,30 +26,22 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.data.NulsHash; -import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.constant.ContractErrorCode; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.helper.ContractTxHelper; -import io.nuls.contract.manager.ContractTokenBalanceManager; import io.nuls.contract.model.bo.ContractResult; import io.nuls.contract.model.dto.AccountAmountDto; -import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.model.po.ContractTokenTransferInfoPo; import io.nuls.contract.model.tx.CallContractTransaction; import io.nuls.contract.model.tx.CreateContractTransaction; import io.nuls.contract.model.tx.DeleteContractTransaction; import io.nuls.contract.service.ContractTxService; -import io.nuls.contract.storage.ContractTokenTransferStorageService; -import io.nuls.contract.util.ContractUtil; import io.nuls.contract.util.Log; import io.nuls.contract.util.MapUtil; import io.nuls.contract.vm.program.ProgramMultyAssetValue; import io.nuls.core.basic.Result; -import io.nuls.core.basic.VarInt; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; -import io.nuls.core.model.ArraysTool; import java.io.IOException; import java.math.BigInteger; @@ -58,7 +50,6 @@ import java.util.Map; import static io.nuls.contract.constant.ContractErrorCode.FAILED; -import static io.nuls.contract.util.ContractUtil.getFailed; import static io.nuls.contract.util.ContractUtil.getSuccess; /** @@ -69,8 +60,6 @@ @Component public class ContractTxServiceImpl implements ContractTxService { - @Autowired - private ContractTokenTransferStorageService contractTokenTransferStorageService; @Autowired private ContractHelper contractHelper; @Autowired @@ -169,72 +158,6 @@ public Result previewContractCallTx(int chainId, byte[] senderBy return contractTxHelper.previewCall(chainId, senderBytes, contractAddressBytes, value, gasLimit, price, methodName, methodDesc, args, multyAssetValues); } - @Deprecated - private Result saveUnConfirmedTokenTransfer(int chainId, CallContractTransaction tx, String sender, String contractAddress, String methodName, String[][] args) { - try { - ContractTokenBalanceManager tokenBalanceManager = contractHelper.getChain(chainId).getContractTokenBalanceManager(); - byte[] senderBytes = AddressTool.getAddress(sender); - byte[] contractAddressBytes = AddressTool.getAddress(contractAddress); - Result contractAddressInfoResult = contractHelper.getContractAddressInfo(chainId, contractAddressBytes); - ContractAddressInfoPo po = contractAddressInfoResult.getData(); - if (po != null && po.isNrc20() && ContractUtil.isTransferMethod(methodName)) { - byte[] txHashBytes = tx.getHash().getBytes(); - byte[] infoKey = ArraysTool.concatenate(senderBytes, txHashBytes, new VarInt(0).encode()); - ContractTokenTransferInfoPo tokenTransferInfoPo = new ContractTokenTransferInfoPo(); - if (ContractConstant.NRC20_METHOD_TRANSFER.equals(methodName)) { - String to = args[0][0]; - String tokenValue = args[1][0]; - BigInteger token = new BigInteger(tokenValue); - Result result = tokenBalanceManager.subtractContractToken(sender, contractAddress, token); - if (result.isFailed()) { - return result; - } - tokenBalanceManager.addContractToken(to, contractAddress, token); - tokenTransferInfoPo.setFrom(senderBytes); - tokenTransferInfoPo.setTo(AddressTool.getAddress(to)); - tokenTransferInfoPo.setValue(token); - } else { - String from = args[0][0]; - // 转出的不是自己的代币（代币授权逻辑），则不保存token待确认交易，因为有调用合约的待确认交易 - if (!sender.equals(from)) { - return getSuccess(); - } - String to = args[1][0]; - String tokenValue = args[2][0]; - BigInteger token = new BigInteger(tokenValue); - Result result = tokenBalanceManager.subtractContractToken(from, contractAddress, token); - if (result.isFailed()) { - return result; - } - tokenBalanceManager.addContractToken(to, contractAddress, token); - tokenTransferInfoPo.setFrom(AddressTool.getAddress(from)); - tokenTransferInfoPo.setTo(AddressTool.getAddress(to)); - tokenTransferInfoPo.setValue(token); - } - - tokenTransferInfoPo.setName(po.getNrc20TokenName()); - tokenTransferInfoPo.setSymbol(po.getNrc20TokenSymbol()); - tokenTransferInfoPo.setDecimals(po.getDecimals()); - tokenTransferInfoPo.setTime(tx.getTime()); - tokenTransferInfoPo.setContractAddress(contractAddress); - tokenTransferInfoPo.setBlockHeight(tx.getBlockHeight()); - tokenTransferInfoPo.setTxHash(txHashBytes); - tokenTransferInfoPo.setStatus((byte) 0); - Result result = contractTokenTransferStorageService.saveTokenTransferInfo(chainId, infoKey, tokenTransferInfoPo); - if (result.isFailed()) { - return result; - } - return getSuccess().setData(infoKey); - } - return getSuccess(); - } catch (Exception e) { - Log.error(e); - Result result = Result.getFailed(ContractErrorCode.CONTRACT_OTHER_ERROR); - result.setMsg(e.getMessage()); - return result; - } - } - @Override public Result contractDeleteTx(int chainId, String sender, String contractAddress, String password, String remark) { @@ -270,15 +193,4 @@ public Result validateContractDeleteTx(int chainId, String sender, String contra return contractTxHelper.validateDelete(chainId, senderBytes, contractAddress, contractAddressBytes); } - @Override - public Result> getTokenTransferInfoList(int chainId, String address) { - try { - byte[] addressBytes = AddressTool.getAddress(address); - List tokenTransferInfoListByAddress = contractTokenTransferStorageService.getTokenTransferInfoListByAddress(chainId, addressBytes); - return getSuccess().setData(tokenTransferInfoListByAddress); - } catch (Exception e) { - Log.error(e); - return getFailed(); - } - } } diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ResultAnalyzerImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ResultAnalyzerImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ResultAnalyzerImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ResultAnalyzerImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ResultHandlerImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ResultHandlerImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/service/impl/ResultHandlerImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ResultHandlerImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractAddressStorageService.java b/module/nuls-cores/src/main/java/io/nuls/contract/storage/ContractAddressStorageService.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractAddressStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/contract/storage/ContractAddressStorageService.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractExecuteResultStorageService.java b/module/nuls-cores/src/main/java/io/nuls/contract/storage/ContractExecuteResultStorageService.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractExecuteResultStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/contract/storage/ContractExecuteResultStorageService.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractOfflineTxHashListStorageService.java b/module/nuls-cores/src/main/java/io/nuls/contract/storage/ContractOfflineTxHashListStorageService.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractOfflineTxHashListStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/contract/storage/ContractOfflineTxHashListStorageService.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractAddressStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/storage/impl/ContractAddressStorageServiceImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractAddressStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/storage/impl/ContractAddressStorageServiceImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractExecuteResultStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/storage/impl/ContractExecuteResultStorageServiceImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractExecuteResultStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/storage/impl/ContractExecuteResultStorageServiceImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractOfflineTxHashListStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/storage/impl/ContractOfflineTxHashListStorageServiceImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractOfflineTxHashListStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/storage/impl/ContractOfflineTxHashListStorageServiceImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/SmartContractVersionChangeInvoker.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java similarity index 89% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java index 2d986c086b..359273aabd 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/tx/common/TransactionCommitAdvice.java @@ -64,13 +64,14 @@ public class TransactionCommitAdvice implements CommonAdvice { @Override public void begin(int chainId, List txList, BlockHeader header) { + Log.info("height: {} call begin", header != null ? header.getHeight() : 0); try { ChainManager.chainHandle(chainId, BlockType.VERIFY_BLOCK.type()); Short currentVersion = ProtocolGroupManager.getCurrentVersion(chainId); - if(currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET ) { + if(currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { BatchInfoV8 batchInfo = contractHelper.getChain(chainId).getBatchInfoV8(); if (batchInfo != null) { - Log.info("contract execute txDataSize is {}, commit txDataSize is {}", batchInfo.getContractResultMap().size(), txList.size()); + Log.info("height: {}, contract execute txDataSize is {}, commit txDataSize is {}", header != null ? header.getHeight() : 0, batchInfo.getContractResultMap().size(), txList.size()); List offlineTxHashList = batchInfo.getOfflineTxHashList(); if(offlineTxHashList != null && !offlineTxHashList.isEmpty()) { @@ -81,7 +82,7 @@ public void begin(int chainId, List txList, BlockHeader header) { } else { ContractPackageDto contractPackageDto = contractHelper.getChain(chainId).getBatchInfo().getContractPackageDto(); if (contractPackageDto != null) { - Log.info("contract execute txDataSize is {}, commit txDataSize is {}", contractPackageDto.getContractResultMap().keySet().size(), txList.size()); + Log.info("height: {}, contract execute txDataSize is {}, commit txDataSize is {}", header != null ? header.getHeight() : 0, contractPackageDto.getContractResultMap().keySet().size(), txList.size()); List offlineTxHashList = contractPackageDto.getOfflineTxHashList(); if(offlineTxHashList != null && !offlineTxHashList.isEmpty()) { @@ -93,7 +94,7 @@ public void begin(int chainId, List txList, BlockHeader header) { // add by pierre at 2019-12-01 处理type10交易的业务提交, 需要协议升级 done if(currentVersion >= ContractContext.UPDATE_VERSION_V250) { List crossTxList = txList.stream().filter(tx -> tx.getType() == TxType.CROSS_CHAIN).collect(Collectors.toList()); - if(currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET ) { + if(currentVersion >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET) { callContractProcessorV8.commit(chainId, crossTxList, header); } else { callContractProcessor.commit(chainId, crossTxList, header); @@ -101,12 +102,14 @@ public void begin(int chainId, List txList, BlockHeader header) { } // end code by pierre } catch (Exception e) { + Log.error(e); throw new RuntimeException(e); } } @Override public void end(int chainId, List txList, BlockHeader blockHeader) { + Log.info("height: {} call end", blockHeader != null ? blockHeader.getHeight() : 0); // 移除临时余额, 临时区块头等当前批次执行数据 Chain chain = contractHelper.getChain(chainId); if(ProtocolGroupManager.getCurrentVersion(chainId) >= ContractContext.UPDATE_VERSION_CONTRACT_ASSET ) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/common/TransactionRollbackAdvice.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/common/TransactionRollbackAdvice.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/common/TransactionRollbackAdvice.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/common/TransactionRollbackAdvice.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v1/CallContractProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v1/CallContractProcessor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v1/CallContractProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v1/CallContractProcessor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v1/CreateContractProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v1/CreateContractProcessor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v1/CreateContractProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v1/CreateContractProcessor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v1/DeleteContractProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v1/DeleteContractProcessor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v1/DeleteContractProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v1/DeleteContractProcessor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v13/CallContractProcessorV13.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v14/CallContractProcessorV14.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v14/CreateContractProcessorV14.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java similarity index 96% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java index ac0f4a2bdb..f1f700323d 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v16/CallContractProcessorV16.java @@ -167,9 +167,6 @@ private Result onCommit(int chainId, ContractWrapperTransaction tx) { } } } - // 处理合约事件 - contractHelper.dealNrc20Events(chainId, stateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); - // 保存合约执行结果 return contractService.saveContractExecuteResult(chainId, tx.getHash(), contractResult); } catch (Exception e) { @@ -194,7 +191,6 @@ private Result onRollback(int chainId, ContractWrapperTransaction tx) { } catch (Exception e) { Log.warn("failed to trace call rollback log, error is {}", e.getMessage()); } - contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); // 处理内部创建合约 List internalCreates = contractResult.getInternalCreates(); if (internalCreates != null && !internalCreates.isEmpty()) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java similarity index 96% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java index 4a2ce6d06a..c394de3b67 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v16/CreateContractProcessorV16.java @@ -157,8 +157,6 @@ private Result onCommit(int chainId, ContractWrapperTransaction tx) throws Excep if (result.isFailed()) { return result; } - //处理NRC20合约事件 - contractHelper.dealNrc20Events(chainId, newestStateRoot, blockHeight, tx.getHash(), tx.getTime(), contractResult.getEvents(), contractResult.isSuccess(), infoPoMap); return result; } @@ -179,7 +177,6 @@ private Result onRollback(int chainId, ContractWrapperTransaction tx) throws Exc } catch (Exception e) { Log.warn("failed to trace create rollback log, error is {}", e.getMessage()); } - contractHelper.rollbackNrc20Events(chainId, tx.getHash(), contractResult.getEvents()); Result result = contractHelper.onRollbackForCreateV16(chainId, contractAddress, contractResult.isNrc20()); if (result.isFailed()) { return result; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v4/ContractReturnGasProcessor.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v4/ContractReturnGasProcessor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v4/ContractReturnGasProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v4/ContractReturnGasProcessor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v8/CallContractProcessorV8.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v8/CallContractProcessorV8.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v8/CallContractProcessorV8.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v8/CallContractProcessorV8.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v8/CreateContractProcessorV8.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v8/CreateContractProcessorV8.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v8/CreateContractProcessorV8.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v8/CreateContractProcessorV8.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v8/DeleteContractProcessorV8.java b/module/nuls-cores/src/main/java/io/nuls/contract/tx/v8/DeleteContractProcessorV8.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/tx/v8/DeleteContractProcessorV8.java rename to module/nuls-cores/src/main/java/io/nuls/contract/tx/v8/DeleteContractProcessorV8.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxOrderAsc.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxOrderAsc.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxOrderAsc.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxOrderAsc.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxOrderDesc.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxOrderDesc.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxOrderDesc.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxOrderDesc.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxTimeAsc.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxTimeAsc.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxTimeAsc.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxTimeAsc.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxTimeDesc.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxTimeDesc.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/CompareTxTimeDesc.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/CompareTxTimeDesc.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractDBUtil.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/ContractDBUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractDBUtil.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/ContractDBUtil.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractLedgerUtil.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/ContractLedgerUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractLedgerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/ContractLedgerUtil.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/ContractUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/ContractUtil.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/ContractUtil.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/Log.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/Log.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/Log.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/Log.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/LogUtil.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/LogUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/LogUtil.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/LogUtil.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/MapUtil.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/MapUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/MapUtil.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/MapUtil.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/VMContext.java b/module/nuls-cores/src/main/java/io/nuls/contract/util/VMContext.java similarity index 97% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/util/VMContext.java rename to module/nuls-cores/src/main/java/io/nuls/contract/util/VMContext.java index 0f179e8e22..428797b694 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/util/VMContext.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/util/VMContext.java @@ -27,7 +27,7 @@ import io.nuls.base.data.BlockHeader; import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractConstant; import io.nuls.contract.helper.ContractHelper; @@ -39,20 +39,15 @@ import io.nuls.contract.vm.program.ProgramMethod; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.model.StringUtils; import java.io.IOException; import java.math.BigInteger; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static io.nuls.contract.constant.ContractConstant.INITIAL_STATE_ROOT; - /** * @Author: PierreLuo * @Date: 2018/5/2 @@ -63,7 +58,7 @@ public class VMContext { @Autowired private ContractHelper contractHelper; @Autowired - private ContractConfig contractConfig; + private NulsCoresConfig contractConfig; private Map assetDecimalsCache = new ConcurrentHashMap<>(); private static Map NRC20_METHODS = null; diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java b/module/nuls-cores/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java rename to module/nuls-cores/src/main/java/io/nuls/contract/validator/CallContractTxValidator.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java b/module/nuls-cores/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java similarity index 98% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java rename to module/nuls-cores/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java index 203f00e273..f6bbb23cc8 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/validator/CreateContractTxValidator.java @@ -31,7 +31,7 @@ import io.nuls.base.data.CoinFrom; import io.nuls.base.data.CoinTo; import io.nuls.base.signture.SignatureUtil; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.helper.ContractHelper; import io.nuls.contract.model.bo.Chain; import io.nuls.contract.model.tx.CreateContractTransaction; @@ -63,7 +63,7 @@ public class CreateContractTxValidator { @Autowired private ContractHelper contractHelper; @Autowired - private ContractConfig contractConfig; + private NulsCoresConfig contractConfig; public Result validate(int chainId, CreateContractTransaction tx) throws NulsException { CoinData coinData = tx.getCoinDataInstance(); diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/DeleteContractTxValidator.java b/module/nuls-cores/src/main/java/io/nuls/contract/validator/DeleteContractTxValidator.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/validator/DeleteContractTxValidator.java rename to module/nuls-cores/src/main/java/io/nuls/contract/validator/DeleteContractTxValidator.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/BigIntegerWrapper.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/BigIntegerWrapper.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/BigIntegerWrapper.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/BigIntegerWrapper.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/Frame.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/Frame.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/Frame.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/Frame.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/GasCost.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/GasCost.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/GasCost.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/GasCost.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/Heap.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/Heap.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/Heap.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/Heap.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/LocalVariables.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/LocalVariables.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/LocalVariables.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/LocalVariables.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/MethodArea.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/MethodArea.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/MethodArea.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/MethodArea.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/MethodArgs.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/MethodArgs.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/MethodArgs.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/MethodArgs.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/ObjectRef.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/ObjectRef.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/ObjectRef.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/ObjectRef.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/OpCode.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/OpCode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/OpCode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/OpCode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/OperandStack.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/OperandStack.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/OperandStack.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/OperandStack.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/Result.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/Result.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/Result.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/Result.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/VM.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VM.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/VM.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/VMFactory.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMFactory.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/VMFactory.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMStack.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/VMStack.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/VMStack.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/VMStack.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCode.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeCacheKey.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodeCacheKey.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeCacheKey.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodeCacheKey.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java similarity index 96% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java index 2ff9491212..9fec609eb2 100644 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java @@ -213,7 +213,7 @@ private static ClassCode load(ClassReader classReader) { } private static Map loadBaseFromResource() { - try (InputStream baseInputStream = ClassCodeLoader.class.getResourceAsStream("/used_classes_base")) { + try (InputStream baseInputStream = ClassCodeLoader.class.getResourceAsStream("/contract/used_classes_base")) { if (baseInputStream == null) { return new HashMap<>(0); } else { @@ -226,19 +226,19 @@ private static Map loadBaseFromResource() { } private static Map loadFromResource() { - return loadFromResourceWithResourceName("/used_classes_sdk"); + return loadFromResourceWithResourceName("/contract/used_classes_sdk"); } private static Map loadFromResource_v8() { - return loadFromResourceWithResourceName("/used_classes_sdk_v8"); + return loadFromResourceWithResourceName("/contract/used_classes_sdk_v8"); } private static Map loadFromResource_v14() { - return loadFromResourceWithResourceName("/used_classes_sdk_v14"); + return loadFromResourceWithResourceName("/contract/used_classes_sdk_v14"); } private static Map loadFromResource_v15() { - return loadFromResourceWithResourceName("/used_classes_sdk_v15"); + return loadFromResourceWithResourceName("/contract/used_classes_sdk_v15"); } private static Map loadFromResourceWithResourceName(String usedClassesName) { diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodes.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodes.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/ClassCodes.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodes.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/Descriptors.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/Descriptors.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/Descriptors.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/Descriptors.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/FieldCode.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/FieldCode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/FieldCode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/FieldCode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/LocalVariableCode.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/LocalVariableCode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/LocalVariableCode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/LocalVariableCode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/MethodCode.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/MethodCode.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/MethodCode.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/MethodCode.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/VariableType.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/code/VariableType.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/code/VariableType.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/code/VariableType.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/exception/ErrorException.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/exception/ErrorException.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/exception/ErrorException.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/exception/ErrorException.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/Dcmp.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/Dcmp.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/Dcmp.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/Dcmp.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/Fcmp.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/Fcmp.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/Fcmp.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/Fcmp.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfAcmp.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfAcmp.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfAcmp.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfAcmp.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfCmp.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfCmp.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfCmp.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfCmp.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfIcmp.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfIcmp.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfIcmp.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/IfIcmp.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/Lcmp.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/Lcmp.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/comparisons/Lcmp.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/comparisons/Lcmp.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Aconst.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Aconst.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Aconst.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Aconst.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Dconst.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Dconst.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Dconst.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Dconst.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Fconst.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Fconst.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Fconst.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Fconst.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Iconst.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Iconst.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Iconst.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Iconst.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Lconst.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Lconst.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Lconst.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Lconst.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Ldc.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Ldc.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Ldc.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Ldc.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Nop.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Nop.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Nop.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Nop.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Xipush.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Xipush.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/constants/Xipush.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/constants/Xipush.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Goto.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Goto.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Goto.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Goto.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Jsr.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Jsr.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Jsr.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Jsr.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Lookupswitch.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Lookupswitch.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Lookupswitch.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Lookupswitch.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Ret.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Ret.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Ret.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Ret.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Return.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Return.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Return.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Return.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Tableswitch.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Tableswitch.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/control/Tableswitch.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/control/Tableswitch.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/D2x.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/D2x.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/D2x.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/D2x.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/F2x.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/F2x.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/F2x.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/F2x.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/I2x.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/I2x.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/I2x.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/I2x.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/L2x.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/L2x.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/conversions/L2x.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/conversions/L2x.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnonnull.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnonnull.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnonnull.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnonnull.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnull.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnull.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnull.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/extended/Ifnull.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/extended/Multianewarray.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/extended/Multianewarray.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/extended/Multianewarray.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/extended/Multianewarray.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Aload.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Aload.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Aload.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Aload.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Dload.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Dload.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Dload.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Dload.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Fload.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Fload.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Fload.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Fload.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Iload.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Iload.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Iload.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Iload.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Lload.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Lload.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Lload.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Lload.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Xaload.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Xaload.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/loads/Xaload.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/loads/Xaload.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Add.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Add.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Add.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Add.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/And.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/And.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/And.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/And.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Div.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Div.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Div.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Div.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Iinc.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Iinc.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Iinc.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Iinc.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Mul.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Mul.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Mul.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Mul.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Neg.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Neg.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Neg.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Neg.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Or.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Or.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Or.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Or.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Rem.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Rem.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Rem.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Rem.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Shl.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Shl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Shl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Shl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Shr.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Shr.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Shr.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Shr.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Sub.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Sub.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Sub.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Sub.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Ushr.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Ushr.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Ushr.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Ushr.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Xor.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Xor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/math/Xor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/math/Xor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Anewarray.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Anewarray.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Anewarray.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Anewarray.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Arraylength.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Arraylength.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Arraylength.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Arraylength.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Athrow.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Athrow.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Athrow.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Athrow.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Checkcast.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Checkcast.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Checkcast.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Checkcast.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Getfield.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Getfield.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Getfield.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Getfield.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Getstatic.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Getstatic.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Getstatic.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Getstatic.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Instanceof.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Instanceof.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Instanceof.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Instanceof.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokedynamic.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokedynamic.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokedynamic.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokedynamic.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokeinterface.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokeinterface.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokeinterface.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokeinterface.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokespecial.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokespecial.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokespecial.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokespecial.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokestatic.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokestatic.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokestatic.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokestatic.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokevirtual.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokevirtual.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Invokevirtual.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Invokevirtual.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Monitorenter.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Monitorenter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Monitorenter.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Monitorenter.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Monitorexit.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Monitorexit.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Monitorexit.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Monitorexit.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/New.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/New.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/New.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/New.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Newarray.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Newarray.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Newarray.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Newarray.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Putfield.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Putfield.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Putfield.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Putfield.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Putstatic.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Putstatic.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/references/Putstatic.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/references/Putstatic.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stack/Dup.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stack/Dup.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stack/Dup.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stack/Dup.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stack/Pop.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stack/Pop.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stack/Pop.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stack/Pop.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stack/Swap.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stack/Swap.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stack/Swap.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stack/Swap.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Astore.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Astore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Astore.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Astore.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Dstore.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Dstore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Dstore.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Dstore.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Fstore.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Fstore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Fstore.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Fstore.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Istore.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Istore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Istore.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Istore.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Lstore.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Lstore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Lstore.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Lstore.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Xastore.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Xastore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/instructions/stores/Xastore.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/instructions/stores/Xastore.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/NativeMethod.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/NativeMethod.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/NativeMethod.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/NativeMethod.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeAddress.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeBlock.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeMsg.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeAbstractStringBuilder.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeAbstractStringBuilder.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeAbstractStringBuilder.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeAbstractStringBuilder.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeCharacter.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeCharacter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeCharacter.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeCharacter.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeClass.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeClass.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeClass.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeClass.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeDouble.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeDouble.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeDouble.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeDouble.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeFloat.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeFloat.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeFloat.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeFloat.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeObject.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeObject.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeObject.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeObject.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeRuntime.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeRuntime.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeRuntime.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeRuntime.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSecurityManager.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSecurityManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSecurityManager.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSecurityManager.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeStrictMath.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeStrictMath.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeStrictMath.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeStrictMath.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeString.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeString.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeString.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeString.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSystem.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSystem.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSystem.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeSystem.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeThrowable.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeThrowable.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeThrowable.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/NativeThrowable.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/reflect/NativeArray.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/reflect/NativeArray.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/lang/reflect/NativeArray.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/lang/reflect/NativeArray.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/sun/misc/NativeVM.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/sun/misc/NativeVM.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/natives/java/sun/misc/NativeVM.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/java/sun/misc/NativeVM.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramAccount.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramAccount.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramAccount.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramAccount.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCreate.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramExecutor.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCall.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInternalCall.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCall.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInternalCall.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInvokeRegisterCmd.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInvokeRegisterCmd.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramInvokeRegisterCmd.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInvokeRegisterCmd.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramMethod.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethodArg.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramMethodArg.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMethodArg.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramMethodArg.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMultyAssetValue.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramMultyAssetValue.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramMultyAssetValue.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramMultyAssetValue.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramNewTx.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramNewTx.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramNewTx.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramNewTx.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramResult.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramResult.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramResult.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramResult.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramStatus.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramStatus.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramStatus.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramStatus.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramTransfer.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramTransfer.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/ProgramTransfer.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramTransfer.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramChecker.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramChecker.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramChecker.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramChecker.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramConstants.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramContext.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramContext.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramContext.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramContext.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramDescriptors.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramDescriptors.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramDescriptors.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramDescriptors.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramInvoke.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramTime.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramTime.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/program/impl/ProgramTime.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramTime.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/CloneUtils.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/util/CloneUtils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/CloneUtils.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/util/CloneUtils.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Constants.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/util/Constants.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Constants.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/util/Constants.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/JsonUtils.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/util/JsonUtils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/JsonUtils.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/util/JsonUtils.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Log.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/util/Log.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Log.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/util/Log.java diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Utils.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/util/Utils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/io/nuls/contract/vm/util/Utils.java rename to module/nuls-cores/src/main/java/io/nuls/contract/vm/util/Utils.java diff --git a/module/nuls-cores/src/main/java/io/nuls/crosschain/CrossChainBootStrap.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/CrossChainBootStrap.java new file mode 100644 index 0000000000..45854861d5 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/CrossChainBootStrap.java @@ -0,0 +1,121 @@ +package io.nuls.crosschain; + +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.core.config.ConfigurationLoader; +import io.nuls.core.core.ioc.SpringLiteContext; +import io.nuls.core.log.Log; +import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.modulebootstrap.Module; +import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.ChainManagerCall; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.manager.ChainManager; + +import java.io.File; +import java.util.Arrays; +import java.util.stream.Collectors; + + +/** + * 跨链模块启动类 + * Cross Chain Module Startup and Initialization Management + * @author tag + * 2019/4/10 + */ +@Component +public class CrossChainBootStrap implements INulsCoresBootstrap { + @Autowired + private NulsCoresConfig nulsCrossChainConfig; + @Autowired + private RegisteredCrossChainService registeredCrossChainService; + + @Autowired + private ChainManager chainManager; + + @Override + public int order() { + return 7; + } + + @Override + public void mainFunction(String[] args) { + this.init(); + } + + @Override + public Module moduleInfo() { + return new Module(ModuleE.CC.name, "1.0"); + } + + public void init() { + try { + initDB(); + chainManager.initChain(); + }catch (Exception e){ + Log.error(e); + } + } + + public void onDependenciesReady(){ + try { + chainManager.runChain(); + /* + * 注册协议,如果为非主网则需激活跨链网络 + */ + for (Chain chain:chainManager.getChainMap().values()) { + if(!chain.isMainChain()){ + NetWorkCall.activeCrossNet(chain.getChainId(), chain.getConfig().getMaxOutAmount(), chain.getConfig().getMaxInAmount(), nulsCrossChainConfig.getCrossSeedIps()); + } + } + /* + * 如果为主网，向链管理模块过去完整的跨链注册信息 + */ + if (nulsCrossChainConfig.isMainNet()) { + RegisteredChainMessage registeredChainMessage = registeredCrossChainService.get(); + if(registeredChainMessage != null && registeredChainMessage.getChainInfoList() != null){ + chainManager.setRegisteredCrossChainList(registeredChainMessage.getChainInfoList()); + }else{ + registeredChainMessage = ChainManagerCall.getRegisteredChainInfo(chainManager); + registeredCrossChainService.save(registeredChainMessage); + chainManager.setRegisteredCrossChainList(registeredChainMessage.getChainInfoList()); + } + } + + //智能合约交易注册 + chainManager.registerContractTx(); + + ConfigurationLoader configurationLoader = SpringLiteContext.getBean(ConfigurationLoader.class); + nulsCrossChainConfig.setSeedNodeList(Arrays.stream(configurationLoader.getValue(ModuleE.Constant.CONSENSUS, "seedNodes").split(",")) + .collect(Collectors.toSet())); + Log.info("cc onDependenciesReady"); + }catch (Exception e){ + Log.error(e); + } + } + + /** + * 初始化数据库 + * Initialization database + */ + private void initDB() throws Exception { + RocksDBService.init(nulsCrossChainConfig.getDataPath() + File.separator + ModuleE.CC.name); + RocksDBService.createTable(NulsCrossChainConstant.DB_NAME_CONSUME_LANGUAGE); + RocksDBService.createTable(NulsCrossChainConstant.DB_NAME_CONSUME_CONGIF); + RocksDBService.createTable(NulsCrossChainConstant.DB_NAME_LOCAL_VERIFIER); + /* + 已注册跨链的链信息操作表 + Registered Cross-Chain Chain Information Operating Table + key：RegisteredChain + value:已注册链信息列表 + */ + RocksDBService.createTable(NulsCrossChainConstant.DB_NAME_REGISTERED_CHAIN); + } + +} diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/CommandConstant.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/CommandConstant.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/CommandConstant.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/CommandConstant.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/CrossChainConstant.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/CrossChainConstant.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/CrossChainConstant.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/CrossChainConstant.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/CrossChainErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/CrossChainErrorCode.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/CrossChainErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/CrossChainErrorCode.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/ParamConstant.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/ParamConstant.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/constant/ParamConstant.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/constant/ParamConstant.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/BroadCtxHashMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/BroadCtxHashMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/BroadCtxHashMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/BroadCtxHashMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/BroadCtxSignMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/BroadCtxSignMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/BroadCtxSignMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/BroadCtxSignMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/CirculationMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/CirculationMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/CirculationMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/CirculationMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/CrossTxRehandleMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/CrossTxRehandleMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/CrossTxRehandleMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/CrossTxRehandleMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/CtxStateMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/CtxStateMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/CtxStateMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/CtxStateMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/GetCirculationMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/GetCirculationMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/GetCirculationMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/GetCirculationMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/GetCtxStateMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/GetCtxStateMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/GetCtxStateMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/GetCtxStateMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/GetOtherCtxMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/GetOtherCtxMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/GetOtherCtxMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/GetOtherCtxMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/NewOtherCtxMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/NewOtherCtxMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/NewOtherCtxMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/NewOtherCtxMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/base/BaseMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/base/BaseMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/base/BaseMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/base/BaseMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxHashHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxHashHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxHashHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxHashHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxSignHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxSignHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxSignHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/BroadCtxSignHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/CtxStateHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/CtxStateHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/CtxStateHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/CtxStateHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/GetCirculationHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/GetCirculationHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/GetCirculationHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/GetCirculationHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/GetCtxStateHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/GetCtxStateHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/GetCtxStateHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/GetCtxStateHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/GetOtherCtxHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/GetOtherCtxHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/GetOtherCtxHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/GetOtherCtxHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/NewOtherCtxHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/NewOtherCtxHandler.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/message/handler/NewOtherCtxHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/message/handler/NewOtherCtxHandler.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/ResetChainInfoTransaction.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/ResetChainInfoTransaction.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/ResetChainInfoTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/ResetChainInfoTransaction.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/AssetInfo.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/AssetInfo.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/AssetInfo.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/AssetInfo.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/ChainInfo.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/ChainInfo.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/ChainInfo.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/ChainInfo.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/Circulation.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/Circulation.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/Circulation.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/Circulation.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/CrossTransferData.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/CrossTransferData.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/CrossTransferData.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/CrossTransferData.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainChangeData.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainChangeData.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainChangeData.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainChangeData.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainMessage.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/RegisteredChainMessage.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/ResetChainInfoData.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/ResetChainInfoData.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/ResetChainInfoData.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/ResetChainInfoData.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierChangeData.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierChangeData.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierChangeData.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierChangeData.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierInitData.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierInitData.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierInitData.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/bo/txdata/VerifierInitData.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/dto/input/CoinDTO.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/dto/input/CoinDTO.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/dto/input/CoinDTO.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/dto/input/CoinDTO.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/dto/input/CrossTxTransferDTO.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/dto/input/CrossTxTransferDTO.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/model/dto/input/CrossTxTransferDTO.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/model/dto/input/CrossTxTransferDTO.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainCmd.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainCmd.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainCmd.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainCmd.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainProtocolCmd.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainProtocolCmd.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainProtocolCmd.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/rpc/cmd/CrossChainProtocolCmd.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/CrossChainService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/CrossChainService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/CrossChainService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/CrossChainService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/ProtocolService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/ProtocolService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/ProtocolService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/ProtocolService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/RegisteredChainChangeService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/RegisteredChainChangeService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/RegisteredChainChangeService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/RegisteredChainChangeService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/ResetChainService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/ResetChainService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/ResetChainService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/ResetChainService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/ResetLocalVerifierService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/ResetLocalVerifierService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/ResetLocalVerifierService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/ResetLocalVerifierService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/VerifierChangeTxService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/VerifierChangeTxService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/VerifierChangeTxService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/VerifierChangeTxService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/VerifierInitService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/VerifierInitService.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/service/VerifierInitService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/service/VerifierInitService.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/ContractCrossChainProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/ContractCrossChainProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/ContractCrossChainProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/ContractCrossChainProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/CrossChainProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/CrossChainProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/CrossChainProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/CrossChainProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/RegisteredChainChangeProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/RegisteredChainChangeProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/RegisteredChainChangeProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/RegisteredChainChangeProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/ResetChainInfoTxProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/ResetChainInfoTxProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/ResetChainInfoTxProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/ResetChainInfoTxProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/ResetLocalVerifierProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/ResetLocalVerifierProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/ResetLocalVerifierProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/ResetLocalVerifierProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierChangeProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierChangeProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierChangeProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierChangeProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierInitProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierInitProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierInitProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/tx/v1/VerifierInitProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/HashSetDuplicateProcessor.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/HashSetDuplicateProcessor.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/HashSetDuplicateProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/HashSetDuplicateProcessor.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/annotation/ResisterTx.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/annotation/ResisterTx.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/annotation/ResisterTx.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/annotation/ResisterTx.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/enumeration/ChainInfoChangeType.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/enumeration/ChainInfoChangeType.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/enumeration/ChainInfoChangeType.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/enumeration/ChainInfoChangeType.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxMethodType.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxMethodType.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxMethodType.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxMethodType.java diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxProperty.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxProperty.java similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxProperty.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/base/utils/enumeration/TxProperty.java diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConstant.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/constant/NulsCrossChainConstant.java similarity index 98% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConstant.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/constant/NulsCrossChainConstant.java index fcd8a794a7..011ba7a52f 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConstant.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/constant/NulsCrossChainConstant.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.constant; +package io.nuls.crosschain.constant; /** * 跨链模块常量管理类 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/constant/NulsCrossChainErrorCode.java similarity index 98% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/constant/NulsCrossChainErrorCode.java index 21ef97c40e..7c063744cd 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainErrorCode.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/constant/NulsCrossChainErrorCode.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.constant; +package io.nuls.crosschain.constant; import io.nuls.core.constant.CommonCodeConstanst; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/ParamConstant.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/constant/ParamConstant.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/ParamConstant.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/constant/ParamConstant.java index 81c4f4869e..ed6bd452ac 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/ParamConstant.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/constant/ParamConstant.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.constant; +package io.nuls.crosschain.constant; /** * 跨链模块参数常量管理类 * @author tag diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/message/CirculationHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/message/CirculationHandler.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/message/CirculationHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/message/CirculationHandler.java index ee04531602..0e6c29c7ef 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/message/CirculationHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/message/CirculationHandler.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.message; +package io.nuls.crosschain.message; import io.nuls.base.RPCUtil; import io.nuls.base.protocol.MessageProcessor; @@ -6,7 +6,7 @@ import io.nuls.core.core.annotation.Component; import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.message.CirculationMessage; -import io.nuls.crosschain.nuls.servive.MainNetService; +import io.nuls.crosschain.servive.MainNetService; /** * CirculationMessage处理类 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/message/CrossTxRehandleMsgHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/message/CrossTxRehandleMsgHandler.java similarity index 89% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/message/CrossTxRehandleMsgHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/message/CrossTxRehandleMsgHandler.java index 35a02e306f..95814ddf4f 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/message/CrossTxRehandleMsgHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/message/CrossTxRehandleMsgHandler.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.message; +package io.nuls.crosschain.message; import io.nuls.base.RPCUtil; import io.nuls.base.api.provider.Result; @@ -13,21 +13,17 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.log.Log; -import io.nuls.core.model.StringUtils; import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.message.CrossTxRehandleMessage; import io.nuls.crosschain.base.utils.HashSetDuplicateProcessor; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.rpc.call.BlockCall; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; -import io.nuls.crosschain.nuls.utils.thread.CrossTxHandler; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.rpc.call.BlockCall; +import io.nuls.crosschain.srorage.CtxStatusService; +import io.nuls.crosschain.utils.manager.ChainManager; +import io.nuls.crosschain.utils.thread.CrossTxHandler; import java.io.IOException; -import java.util.Map; /** * @Author: zhoulijun diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/BroadFailFlag.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/BroadFailFlag.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/BroadFailFlag.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/BroadFailFlag.java index 02f7e57dc9..871e25e831 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/BroadFailFlag.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/BroadFailFlag.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.bo; +package io.nuls.crosschain.model.bo; public class BroadFailFlag { private boolean verifierInitFlag = false; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/Chain.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/Chain.java similarity index 94% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/Chain.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/Chain.java index c1956a9034..9cc81db83d 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/Chain.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/Chain.java @@ -1,25 +1,18 @@ -package io.nuls.crosschain.nuls.model.bo; +package io.nuls.crosschain.model.bo; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; -import io.nuls.base.signture.P2PHKSignature; -import io.nuls.core.crypto.HexUtil; -import io.nuls.core.exception.NulsException; +import io.nuls.common.ConfigBean; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.thread.ThreadUtils; import io.nuls.core.thread.commom.NulsThreadFactory; -import io.nuls.crosschain.base.message.BroadCtxSignMessage; -import io.nuls.crosschain.nuls.model.bo.config.ConfigBean; -import io.nuls.crosschain.nuls.model.bo.message.UntreatedMessage; -import io.nuls.crosschain.nuls.model.bo.message.WaitBroadSignMessage; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; +import io.nuls.crosschain.model.bo.message.UntreatedMessage; +import io.nuls.crosschain.model.bo.message.WaitBroadSignMessage; -import java.security.Signature; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; /** diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/CmdRegisterDto.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/CmdRegisterDto.java similarity index 98% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/CmdRegisterDto.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/CmdRegisterDto.java index 02a1420835..872e1269e3 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/CmdRegisterDto.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/CmdRegisterDto.java @@ -23,7 +23,7 @@ * */ -package io.nuls.crosschain.nuls.model.bo; +package io.nuls.crosschain.model.bo; import java.util.List; /** diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/CtxStateEnum.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/CtxStateEnum.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/CtxStateEnum.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/CtxStateEnum.java index a37769c5e5..a94b286f5b 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/CtxStateEnum.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/CtxStateEnum.java @@ -22,7 +22,7 @@ * SOFTWARE. * */ -package io.nuls.crosschain.nuls.model.bo; +package io.nuls.crosschain.model.bo; /** * 交易状态枚举 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/NodeType.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/NodeType.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/NodeType.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/NodeType.java index d86606b4f5..df66b738a5 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/NodeType.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/NodeType.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.bo; +package io.nuls.crosschain.model.bo; /** * 节点类型 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/message/UntreatedMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/message/UntreatedMessage.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/message/UntreatedMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/message/UntreatedMessage.java index af8551e4f5..79d687b04c 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/message/UntreatedMessage.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/message/UntreatedMessage.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.bo.message; +package io.nuls.crosschain.model.bo.message; import io.nuls.base.data.NulsHash; import io.nuls.crosschain.base.message.base.BaseMessage; /** diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/message/WaitBroadSignMessage.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/message/WaitBroadSignMessage.java similarity index 95% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/message/WaitBroadSignMessage.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/message/WaitBroadSignMessage.java index 0fcaf7bbe4..81a98e1713 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/message/WaitBroadSignMessage.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/message/WaitBroadSignMessage.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.bo.message; +package io.nuls.crosschain.model.bo.message; import io.nuls.crosschain.base.message.BroadCtxSignMessage; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/txdata/CrossTxData.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/txdata/CrossTxData.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/txdata/CrossTxData.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/txdata/CrossTxData.java index c9777b0719..0fd6e041c9 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/txdata/CrossTxData.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/bo/txdata/CrossTxData.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.bo.txdata; +package io.nuls.crosschain.model.bo.txdata; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/CtxStatusPO.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/CtxStatusPO.java similarity index 98% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/CtxStatusPO.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/CtxStatusPO.java index bd3e92adf4..0562258c82 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/CtxStatusPO.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/CtxStatusPO.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.nuls.crosschain.nuls.model.po; +package io.nuls.crosschain.model.po; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/LocalVerifierPO.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/LocalVerifierPO.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/LocalVerifierPO.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/LocalVerifierPO.java index b4fca7cc62..83942cc041 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/LocalVerifierPO.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/LocalVerifierPO.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.po; +package io.nuls.crosschain.model.po; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/SendCtxHashPO.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/SendCtxHashPO.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/SendCtxHashPO.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/SendCtxHashPO.java index c98ef7e7e4..9f400ac974 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/SendCtxHashPO.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/SendCtxHashPO.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.po; +package io.nuls.crosschain.model.po; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/VerifierChangeSendFailPO.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/VerifierChangeSendFailPO.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/VerifierChangeSendFailPO.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/VerifierChangeSendFailPO.java index 7ac82495ca..7c3e71e24f 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/po/VerifierChangeSendFailPO.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/model/po/VerifierChangeSendFailPO.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.model.po; +package io.nuls.crosschain.model.po; import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.basic.NulsOutputStreamBuffer; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/AccountCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/AccountCall.java similarity index 82% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/AccountCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/AccountCall.java index 1df8c8b58f..eeec6c772a 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/AccountCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/AccountCall.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -7,16 +7,13 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.utils.CommonUtil; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.utils.CommonUtil; import java.util.HashMap; import java.util.List; import java.util.Map; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.INIT_CAPACITY_8; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.RPC_VERSION; - /** * 与账户模块交互类 * Interaction class with account module @@ -31,8 +28,8 @@ public class AccountCall { public static String getPrikey(String address, String password) throws NulsException { try { int chainId = AddressTool.getChainIdByAddress(address); - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("address", address); params.put("password", password); @@ -49,8 +46,8 @@ public static String getPrikey(String address, String password) throws NulsExcep public static boolean isEncrypted(String address) throws NulsException { try { int chainId = AddressTool.getChainIdByAddress(address); - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("address", address); HashMap result = (HashMap) CommonCall.request(ModuleE.AC.abbr, "ac_isEncrypted", params); @@ -71,8 +68,8 @@ public static MultiSigAccount getMultiSigAccount(byte[] multiSignAddress) throws try { String address = AddressTool.getStringAddressByBytes(multiSignAddress); int chainId = AddressTool.getChainIdByAddress(address); - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("address", address); HashMap result = (HashMap) CommonCall.request(ModuleE.AC.abbr, "ac_getMultiSignAccount", params); @@ -94,8 +91,8 @@ public static MultiSigAccount getMultiSigAccount(byte[] multiSignAddress) throws public static P2PHKSignature signDigest(String address, String password, byte[] data) throws NulsException { try { int chainId = AddressTool.getChainIdByAddress(address); - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("address", address); params.put("password", password); diff --git a/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/BlockCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/BlockCall.java new file mode 100644 index 0000000000..c598d85ba8 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/BlockCall.java @@ -0,0 +1,38 @@ +package io.nuls.crosschain.rpc.call; + +import io.nuls.core.rpc.info.Constants; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.model.message.Response; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.bo.Chain; + +import java.util.HashMap; +import java.util.Map; + +/** + * 调用其他模块跟交易相关的接口 + * + * @author tag + * @date 2019/4/12 + */ +public class BlockCall { + /** + * 查询区块状态 + * */ + public static int getBlockStatus(Chain chain) { + try { + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.CHAIN_ID, chain.getChainId()); + Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.BL.abbr, "getStatus", params); + if (!cmdResp.isSuccess()) { + chain.getLogger().error("get block status error!"); + } + return (int)((HashMap) ((HashMap) cmdResp.getResponseData()).get("getStatus")).get("status"); + } catch (Exception e) { + chain.getLogger().error(e); + return 0; + } + } + +} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/ChainManagerCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/ChainManagerCall.java similarity index 87% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/ChainManagerCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/ChainManagerCall.java index 4466394c51..c0eb71b1ed 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/ChainManagerCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/ChainManagerCall.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.base.RPCUtil; import io.nuls.base.data.Transaction; @@ -12,16 +12,14 @@ import io.nuls.crosschain.base.model.bo.AssetInfo; import io.nuls.crosschain.base.model.bo.ChainInfo; import io.nuls.crosschain.base.model.bo.Circulation; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.utils.manager.ChainManager; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.INIT_CAPACITY_8; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.RPC_VERSION; - /** * 与跨链管理模块交易接口 * @@ -38,8 +36,8 @@ public class ChainManagerCall { @SuppressWarnings("unchecked") public static boolean verifyCtxAsset(int chainId, Transaction tx) throws NulsException { try { - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("tx", RPCUtil.encode(tx.serialize())); HashMap result = (HashMap) CommonCall.request(ModuleE.CM.abbr,"cm_assetCirculateValidator", params); @@ -59,8 +57,8 @@ public static boolean verifyCtxAsset(int chainId, Transaction tx) throws NulsExc @SuppressWarnings("unchecked") public static boolean ctxAssetCirculateCommit(int chainId,List txList, String blockHeader) throws NulsException { try { - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("txList", txList); params.put("blockHeader", blockHeader); @@ -82,8 +80,8 @@ public static boolean ctxAssetCirculateCommit(int chainId,List txList, S @SuppressWarnings("unchecked") public static boolean ctxAssetCirculateRollback(int chainId,List txList, String blockHeader) throws NulsException { try { - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("txList", txList); params.put("blockHeader", blockHeader); @@ -112,8 +110,8 @@ public static void sendCirculation(int chainId, CirculationMessage message) thro assertList.add(assertInfoMap); } } - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chainId); params.put("assets", assertList); CommonCall.request(ModuleE.CM.abbr,"updateChainAsset", params); diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/CommonCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/CommonCall.java similarity index 95% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/CommonCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/CommonCall.java index 3c809396c4..d7577c473d 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/CommonCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/CommonCall.java @@ -1,6 +1,6 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainConstant; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/ConsensusCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/ConsensusCall.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/ConsensusCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/ConsensusCall.java index f5880284b8..2aaa91d57c 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/ConsensusCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/ConsensusCall.java @@ -1,13 +1,12 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.base.RPCUtil; -import io.nuls.base.data.BlockExtendsData; import io.nuls.base.data.BlockHeader; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; -import io.nuls.crosschain.nuls.model.bo.Chain; +import io.nuls.crosschain.model.bo.Chain; import java.util.HashMap; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/LedgerCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/LedgerCall.java similarity index 84% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/LedgerCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/LedgerCall.java index 173909e9e2..6bb287ec0e 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/LedgerCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/LedgerCall.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -10,7 +10,8 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.crosschain.base.model.bo.Circulation; -import io.nuls.crosschain.nuls.model.bo.Chain; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.bo.Chain; import java.math.BigInteger; import java.util.ArrayList; @@ -18,9 +19,6 @@ import java.util.List; import java.util.Map; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.INIT_CAPACITY_8; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.RPC_VERSION; - /** * 调用其他模块跟交易相关的接口 * @@ -41,8 +39,8 @@ public class LedgerCall { */ public static byte[] getNonce(Chain chain, String address, int assetChainId, int assetId) throws NulsException { try { - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chain.getChainId()); params.put("address", address); params.put("assetChainId", assetChainId); @@ -63,8 +61,8 @@ public static byte[] getNonce(Chain chain, String address, int assetChainId, int public static BigInteger getBalanceNonce(Chain chain, byte[] address, int assetChainId, int assetId) throws NulsException { try { String addressString = AddressTool.getStringAddressByBytes(address); - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chain.getChainId()); params.put("assetChainId", assetChainId); params.put("assetId", assetId); @@ -86,8 +84,8 @@ public static BigInteger getBalanceNonce(Chain chain, byte[] address, int assetC */ @SuppressWarnings("unchecked") public static Map getBalanceAndNonce(Chain chain, String address, int assetChainId, int assetId) throws NulsException { - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chain.getChainId()); params.put("assetChainId", assetChainId); params.put("assetId", assetId); @@ -111,8 +109,8 @@ public static Map getBalanceAndNonce(Chain chain, String address public static BigInteger getBalance(Chain chain, byte[] address, int assetChainId, int assetId) throws NulsException { try { String addressString = AddressTool.getStringAddressByBytes(address); - Map params = new HashMap<>(INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chain.getChainId()); params.put("assetChainId", assetChainId); params.put("assetId", assetId); @@ -133,7 +131,7 @@ public static BigInteger getBalance(Chain chain, byte[] address, int assetChainI public static List getAssetsById(Chain chain, String assetIds ) throws NulsException { try { Map params = new HashMap<>(4); - params.put(Constants.VERSION_KEY_STR, RPC_VERSION); + params.put(Constants.VERSION_KEY_STR, NulsCrossChainConstant.RPC_VERSION); params.put(Constants.CHAIN_ID, chain.getChainId()); params.put("assetIds", assetIds); Map result = (Map)CommonCall.request(ModuleE.LG.abbr, "getAssetsById", params); diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/NetWorkCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/NetWorkCall.java similarity index 80% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/NetWorkCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/NetWorkCall.java index ab97356d68..b7bd953046 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/NetWorkCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/NetWorkCall.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.base.RPCUtil; import io.nuls.core.exception.NulsException; @@ -9,9 +9,9 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.crosschain.base.message.base.BaseMessage; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.utils.LoggerUtil; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.utils.LoggerUtil; import java.util.ArrayList; import java.util.HashMap; @@ -27,28 +27,6 @@ * 2019/4/10 */ public class NetWorkCall { - /** - * 注册消息处理器 - * @return - */ - public static boolean register() { - try { - Map map = new HashMap<>(2); - List> cmds = new ArrayList<>(); - map.put("role", ModuleE.CC.abbr); - List list = List.of(GET_OTHER_CTX_MESSAGE,NEW_OTHER_CTX_MESSAGE,VERIFY_CTX_MESSAGE,CTX_VERIFY_RESULT_MESSAGE,GET_CTX_STATE_MESSAGE,CTX_STATE_MESSAGE,BROAD_CTX_HASH_MESSAGE,BROAD_CTX_SIGN_MESSAGE,GET_CIRCULLAT_MESSAGE); - map.put("protocolCmds", list); - boolean success = ResponseMessageProcessor.requestAndResponse(ModuleE.NW.abbr, "nw_protocolRegister", map).isSuccess(); - while (!success) { - Thread.sleep(1000L); - success = ResponseMessageProcessor.requestAndResponse(ModuleE.NW.abbr, "nw_protocolRegister", map).isSuccess(); - } - return true; - } catch (Exception e) { - LoggerUtil.commonLog.error(e); - } - return false; - } /** * 给网络上节点广播消息 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/SmartContractCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/SmartContractCall.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/SmartContractCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/SmartContractCall.java index eb969f5cf9..3dd51fa746 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/SmartContractCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/SmartContractCall.java @@ -1,11 +1,11 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.core.log.Log; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; -import io.nuls.crosschain.nuls.model.bo.CmdRegisterDto; +import io.nuls.crosschain.model.bo.CmdRegisterDto; import java.util.HashMap; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/TransactionCall.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/TransactionCall.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/TransactionCall.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/TransactionCall.java index 85ae5ab8d5..c73682dd1a 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/TransactionCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/call/TransactionCall.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.rpc.call; +package io.nuls.crosschain.rpc.call; import io.nuls.core.constant.ErrorCode; import io.nuls.core.exception.NulsException; @@ -6,8 +6,8 @@ import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; import java.util.HashMap; import java.util.Map; diff --git a/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CcmBlockCmd.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CcmBlockCmd.java new file mode 100644 index 0000000000..09676b7dda --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CcmBlockCmd.java @@ -0,0 +1,39 @@ +package io.nuls.crosschain.rpc.cmd; + +import io.nuls.core.rpc.model.*; +import io.nuls.crosschain.servive.BlockService; +import io.nuls.core.rpc.cmd.BaseCmd; +import io.nuls.core.rpc.model.message.Response; +import io.nuls.core.basic.Result; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; + +import java.util.Map; + +/** + * 提供给区块模块调用的接口 + * @author tag + * @date 2019/4/25 + */ +@Component +@NulsCoresCmd(module = ModuleE.CC) +public class CcmBlockCmd extends BaseCmd { + @Autowired + private BlockService service; + /** + * 区块模块高度变化通知跨链模块 + * */ + @CmdAnnotation(cmd = "newBlockHeight", version = 1.0, description = "链区块高度变更/receive new block height") + @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID") + @Parameter(parameterName = "height", parameterType = "long", parameterDes = "链ID") + @Parameter(parameterName = "download", parameterType = "int", parameterDes = "download 0区块下载中,1接收到最新区块") + @ResponseData(description = "无特定返回值，没有错误即成功") + public Response newBlockHeight(Map params){ + Result result = service.newBlockHeight(params); + if(result.isFailed()){ + return failed(result.getErrorCode()); + } + return success(result.getData()); + } + +} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CrossChainTxCmd.java similarity index 87% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CrossChainTxCmd.java index 85e8daaa1b..905ab3733d 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/CrossChainTxCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/CrossChainTxCmd.java @@ -1,10 +1,9 @@ -package io.nuls.crosschain.nuls.rpc.cmd; +package io.nuls.crosschain.rpc.cmd; import io.nuls.base.api.provider.Result; import io.nuls.base.api.provider.ServiceManager; import io.nuls.base.api.provider.transaction.TransferService; import io.nuls.base.api.provider.transaction.facade.GetConfirmedTxByHashReq; -import io.nuls.base.api.provider.transaction.facade.GetTxByHashReq; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; import io.nuls.core.constant.TxType; @@ -12,20 +11,17 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.rpc.cmd.BaseCmd; -import io.nuls.core.rpc.model.CmdAnnotation; -import io.nuls.core.rpc.model.Parameter; -import io.nuls.core.rpc.model.ResponseData; -import io.nuls.core.rpc.model.TypeDescriptor; +import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.message.CrossTxRehandleMessage; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.message.CrossTxRehandleMsgHandler; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.srorage.ConvertCtxService; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.common.NulsCoresConfig; +import io.nuls.crosschain.message.CrossTxRehandleMsgHandler; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.srorage.ConvertCtxService; +import io.nuls.crosschain.srorage.CtxStatusService; +import io.nuls.crosschain.utils.manager.ChainManager; import java.io.IOException; import java.util.Map; @@ -36,6 +32,7 @@ * @Description: 功能描述 */ @Component +@NulsCoresCmd(module = ModuleE.CC) public class CrossChainTxCmd extends BaseCmd { @Autowired @@ -45,7 +42,7 @@ public class CrossChainTxCmd extends BaseCmd { private CtxStatusService ctxStatusService; @Autowired - NulsCrossChainConfig config; + NulsCoresConfig config; @Autowired private ChainManager chainManager; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/MainNetCmd.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/MainNetCmd.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/MainNetCmd.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/MainNetCmd.java index 3fe59ce5dd..51c807ccc6 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/MainNetCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/rpc/cmd/MainNetCmd.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.rpc.cmd; +package io.nuls.crosschain.rpc.cmd; import io.nuls.base.RPCUtil; import io.nuls.base.basic.NulsByteBuffer; @@ -12,11 +12,10 @@ import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.constant.CrossChainErrorCode; import io.nuls.crosschain.base.message.CirculationMessage; -import io.nuls.crosschain.base.model.dto.input.CoinDTO; import io.nuls.crosschain.base.service.ResetLocalVerifierService; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.servive.MainNetService; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.servive.MainNetService; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; import java.util.HashMap; import java.util.List; @@ -28,6 +27,7 @@ * @date 2019/4/23 */ @Component +@NulsCoresCmd(module = ModuleE.CC) public class MainNetCmd extends BaseCmd { @Autowired private MainNetService service; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/BlockService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/BlockService.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/BlockService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/BlockService.java index 2532d9347f..58ae323113 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/BlockService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/BlockService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.servive; +package io.nuls.crosschain.servive; import io.nuls.core.basic.Result; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/MainNetService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/MainNetService.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/MainNetService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/MainNetService.java index d7edec4c34..c2497fb31f 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/MainNetService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/MainNetService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.servive; +package io.nuls.crosschain.servive; import io.nuls.core.basic.Result; import io.nuls.crosschain.base.message.CirculationMessage; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/BlockServiceImpl.java similarity index 70% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/BlockServiceImpl.java index cb2febc00c..9ad37c58a9 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/BlockServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/BlockServiceImpl.java @@ -1,43 +1,32 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.RPCUtil; -import io.nuls.base.basic.AddressTool; import io.nuls.base.data.BlockExtendsData; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.Result; -import io.nuls.core.constant.TxType; +import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.crosschain.base.constant.CommandConstant; -import io.nuls.crosschain.base.message.BroadCtxHashMessage; -import io.nuls.crosschain.base.model.bo.ChainInfo; -import io.nuls.crosschain.base.model.bo.txdata.VerifierChangeData; -import io.nuls.crosschain.base.model.bo.txdata.VerifierInitData; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.BroadFailFlag; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; -import io.nuls.crosschain.nuls.model.po.VerifierChangeSendFailPO; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.servive.BlockService; -import io.nuls.crosschain.nuls.srorage.*; -import io.nuls.crosschain.nuls.utils.BroadCtxUtil; -import io.nuls.crosschain.nuls.utils.MessageUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; -import io.nuls.crosschain.nuls.utils.thread.VerifierChangeTxHandler; +import io.nuls.core.crypto.HexUtil; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.model.bo.BroadFailFlag; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import io.nuls.crosschain.rpc.call.ConsensusCall; +import io.nuls.crosschain.servive.BlockService; +import io.nuls.crosschain.srorage.*; +import io.nuls.crosschain.utils.BroadCtxUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; +import io.nuls.crosschain.utils.thread.VerifierChangeTxHandler; import java.util.*; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode.*; -import static io.nuls.crosschain.nuls.constant.ParamConstant.CHAIN_ID; -import static io.nuls.crosschain.nuls.constant.ParamConstant.NEW_BLOCK_HEIGHT; - /** * 提供给区块模块调用的接口实现类 * @author tag @@ -55,7 +44,7 @@ public class BlockServiceImpl implements BlockService { private SendedHeightService sendedHeightService; @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private ConvertCtxService convertCtxService; @@ -69,21 +58,21 @@ public class BlockServiceImpl implements BlockService { @Override @SuppressWarnings("unchecked") public Result syncStatusUpdate(Map params) { - if (params.get(CHAIN_ID) == null || params.get(ParamConstant.SYNC_STATUS) == null) { - return Result.getFailed(PARAMETER_ERROR); + if (params.get(ParamConstant.CHAIN_ID) == null || params.get(ParamConstant.SYNC_STATUS) == null) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } - int chainId = (int) params.get(CHAIN_ID); + int chainId = (int) params.get(ParamConstant.CHAIN_ID); if (chainId <= 0) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } int syncStatus = (int)params.get(ParamConstant.SYNC_STATUS); chain.setSyncStatus(syncStatus); chain.getLogger().info("节点同步状态变更，syncStatus:{}",syncStatus ); - return Result.getSuccess(SUCCESS); + return Result.getSuccess(CommonCodeConstanst.SUCCESS); } @Override @@ -93,9 +82,9 @@ public Result newBlockHeight(Map params) { if(result.isFailed()){ return result; } - int chainId = (int) params.get(CHAIN_ID); + int chainId = (int) params.get(ParamConstant.CHAIN_ID); Chain chain = chainManager.getChainMap().get(chainId); - long height = Long.valueOf(params.get(NEW_BLOCK_HEIGHT).toString()); + long height = Long.valueOf(params.get(ParamConstant.NEW_BLOCK_HEIGHT).toString()); chain.getLogger().info("收到区块高度更新信息，最新区块高度为：{}", height); //查询是否有待广播的跨链交易 Map sendHeightMap = sendHeightService.getList(chainId); @@ -130,9 +119,12 @@ public Result newBlockHeight(Map params) { } } if(broadFailCtxHash.size() > 0){ - po.setHashList(broadFailCtxHash); - sendHeightService.save(cacheHeight, po, chainId); - chain.getLogger().error("区块高度为{}的跨链交易广播失败",cacheHeight); + int ONE_DAY_HEIGHT = 360 * 24; + if(height - cacheHeight < ONE_DAY_HEIGHT){ + po.setHashList(broadFailCtxHash); + sendHeightService.save(cacheHeight, po, chainId); + chain.getLogger().error("区块高度为{}的跨链交易广播失败",cacheHeight); + } }else{ sendHeightService.delete(cacheHeight, chainId); chain.getLogger().info("区块高度为{}的跨链交易广播成功",cacheHeight); @@ -143,20 +135,21 @@ public Result newBlockHeight(Map params) { } } chain.getLogger().debug("区块高度更新消息处理完成,Height:{}\n\n",height); - return Result.getSuccess(SUCCESS); + return Result.getSuccess(CommonCodeConstanst.SUCCESS); } private Result paramValid(Map params){ - if (params.get(CHAIN_ID) == null || params.get(NEW_BLOCK_HEIGHT) == null || params.get(ParamConstant.PARAM_BLOCK_HEADER) == null) { - return Result.getFailed(PARAMETER_ERROR); + if (params.get(ParamConstant.CHAIN_ID) == null || params.get(ParamConstant.NEW_BLOCK_HEIGHT) == null || params.get(ParamConstant.PARAM_BLOCK_HEADER) == null) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } - int chainId = (int) params.get(CHAIN_ID); + int chainId = (int) params.get(ParamConstant.CHAIN_ID); + int download = (int) params.get("download"); if (chainId <= 0) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } try { BlockHeader blockHeader = new BlockHeader(); @@ -165,17 +158,17 @@ private Result paramValid(Map params){ if(!chainManager.isCrossNetUseAble()){ chainManager.getChainHeaderMap().put(chainId, blockHeader); chain.getLogger().info("等待共识网络组网完成"); - return Result.getSuccess(SUCCESS); + return Result.getSuccess(CommonCodeConstanst.SUCCESS); } if(config.isMainNet() && chainManager.getRegisteredCrossChainList().size() <= 1){ chain.getLogger().info("当前没有注册链" ); chainManager.getChainHeaderMap().put(chainId, blockHeader); - return Result.getSuccess(SUCCESS); + return Result.getSuccess(CommonCodeConstanst.SUCCESS); } /* - 检测是否有轮次变化，如果有轮次变化，查询共识模块共识节点是否有变化，如果有变化则创建验证人变更交易(该操作需要在验证人初始化交易之后) + 区块链在运行状态(download 0区块下载中,1接收到最新区块)，检测是否有轮次变化，如果有轮次变化，查询共识模块共识节点是否有变化，如果有变化则创建验证人变更交易(该操作需要在验证人初始化交易之后) */ - if(chain.getVerifierList() != null && !chain.getVerifierList().isEmpty()){ + if(download == 1 && chain.getVerifierList() != null && !chain.getVerifierList().isEmpty()){ Map> agentChangeMap; BlockHeader localHeader = chainManager.getChainHeaderMap().get(chainId); if(localHeader != null){ @@ -183,7 +176,7 @@ private Result paramValid(Map params){ BlockExtendsData localExtendsData = localHeader.getExtendsData(); if(blockExtendsData.getRoundIndex() == localExtendsData.getRoundIndex()){ chainManager.getChainHeaderMap().put(chainId, blockHeader); - return Result.getSuccess(SUCCESS); + return Result.getSuccess(CommonCodeConstanst.SUCCESS); } agentChangeMap = ConsensusCall.getAgentChangeInfo(chain, localHeader.getExtend(), blockHeader.getExtend()); }else{ @@ -209,8 +202,8 @@ private Result paramValid(Map params){ chainManager.getChainHeaderMap().put(chainId, blockHeader); }catch (Exception e){ chain.getLogger().error(e); - return Result.getFailed(DATA_PARSE_ERROR); + return Result.getFailed(CommonCodeConstanst.DATA_PARSE_ERROR); } - return Result.getSuccess(SUCCESS); + return Result.getSuccess(CommonCodeConstanst.SUCCESS); } } diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/MainNetServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/MainNetServiceImpl.java similarity index 87% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/MainNetServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/MainNetServiceImpl.java index 9fd876f822..69f8433381 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/MainNetServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/MainNetServiceImpl.java @@ -1,11 +1,16 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.basic.TransactionFeeCalculator; -import io.nuls.base.data.*; +import io.nuls.base.data.CoinData; +import io.nuls.base.data.CoinFrom; +import io.nuls.base.data.CoinTo; +import io.nuls.base.data.Transaction; import io.nuls.base.signture.P2PHKSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.Result; +import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -16,25 +21,29 @@ import io.nuls.core.model.ByteUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.crosschain.base.constant.CommandConstant; -import io.nuls.crosschain.base.message.*; +import io.nuls.crosschain.base.message.CirculationMessage; +import io.nuls.crosschain.base.message.GetCirculationMessage; import io.nuls.crosschain.base.model.bo.AssetInfo; import io.nuls.crosschain.base.model.bo.ChainInfo; import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; import io.nuls.crosschain.base.utils.enumeration.ChainInfoChangeType; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.*; -import io.nuls.crosschain.nuls.servive.MainNetService; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.LoggerUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; -import io.nuls.crosschain.nuls.utils.manager.LocalVerifierManager; -import io.nuls.crosschain.nuls.utils.thread.CrossTxHandler; -import io.nuls.crosschain.nuls.utils.validator.CrossTxValidator; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.BlockCall; +import io.nuls.crosschain.rpc.call.ChainManagerCall; +import io.nuls.crosschain.rpc.call.ConsensusCall; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.servive.MainNetService; +import io.nuls.crosschain.srorage.CtxStatusService; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.LoggerUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; +import io.nuls.crosschain.utils.manager.LocalVerifierManager; +import io.nuls.crosschain.utils.thread.CrossTxHandler; +import io.nuls.crosschain.utils.validator.CrossTxValidator; import java.io.IOException; import java.math.BigInteger; @@ -43,13 +52,7 @@ import java.util.List; import java.util.Map; -import static io.nuls.core.constant.CommonCodeConstanst.DATA_PARSE_ERROR; -import static io.nuls.core.constant.CommonCodeConstanst.PARAMETER_ERROR; -import static io.nuls.core.constant.CommonCodeConstanst.SERIALIZE_ERROR; -import static io.nuls.core.constant.CommonCodeConstanst.SUCCESS; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode.*; -import static io.nuls.crosschain.nuls.constant.ParamConstant.CHAIN_ID; -import static io.nuls.crosschain.nuls.constant.ParamConstant.TX_HASH; +import static io.nuls.core.constant.CommonCodeConstanst.*; /** @@ -63,7 +66,7 @@ public class MainNetServiceImpl implements MainNetService { @Autowired private ChainManager chainManager; @Autowired - private NulsCrossChainConfig nulsCrossChainConfig; + private NulsCoresConfig nulsCrossChainConfig; @Autowired private RegisteredCrossChainService registeredCrossChainService; @@ -96,7 +99,7 @@ public Result registerCrossChain(Map params) { chain.getLogger().info("The first time the primary network has chain registration, cross chain initialization and local verification list"); boolean result = LocalVerifierManager.initLocalVerifier(chain, (List) ConsensusCall.getPackerInfo(chain).get(ParamConstant.PARAM_PACK_ADDRESS_LIST)); if(!result){ - return Result.getFailed(DB_SAVE_ERROR); + return Result.getFailed(CommonCodeConstanst.DB_SAVE_ERROR); } } chain.getLogger().info("有新链注册跨链，chainID:{},初始验证人列表：{}", chainInfo.getChainId(), chainInfo.getVerifierList().toString()); @@ -210,7 +213,7 @@ public Result crossChainRegisterChange(Map params) { LoggerUtil.commonLog.error("本链不是主网"); return Result.getFailed(PARAMETER_ERROR); } - int chainId = (int) params.get(CHAIN_ID); + int chainId = (int) params.get(ParamConstant.CHAIN_ID); if (chainId != nulsCrossChainConfig.getMainChainId()) { LoggerUtil.commonLog.error("本链不是主网"); @@ -219,7 +222,7 @@ public Result crossChainRegisterChange(Map params) { Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { LoggerUtil.commonLog.error("链不存在"); - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } try { @@ -261,11 +264,11 @@ public Result tokenOutCrossChain(Map params) { int chainId = Integer.valueOf(params.get(ParamConstant.CHAIN_ID).toString()); Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } if (!chainManager.isCrossNetUseAble()) { chain.getLogger().info("跨链网络组网异常！"); - return Result.getFailed(CROSS_CHAIN_NETWORK_UNAVAILABLE); + return Result.getFailed(NulsCrossChainErrorCode.CROSS_CHAIN_NETWORK_UNAVAILABLE); } int assetId = Integer.valueOf(params.get(ParamConstant.ASSET_ID).toString()); String fromAddress = (String) params.get(ParamConstant.FROM); @@ -302,15 +305,15 @@ public Result tokenOutCrossChain(Map params) { BigInteger available = new BigInteger(contractBalance); if (BigIntegerUtils.isLessThan(available, targetFee)) { chain.getLogger().warn("手续费不足"); - return Result.getFailed(INSUFFICIENT_FEE); + return Result.getFailed(NulsCrossChainErrorCode.INSUFFICIENT_FEE); } coinData.addFrom(feeFrom); tx.setCoinData(coinData.serialize()); if(!txValidator.validateTx(chain, tx, null)){ chain.getLogger().error("Transaction validation failed"); - return Result.getFailed(COINDATA_VERIFY_FAIL); + return Result.getFailed(NulsCrossChainErrorCode.COINDATA_VERIFY_FAIL); } - result.put(TX_HASH, tx.getHash().toHex()); + result.put(ParamConstant.TX_HASH, tx.getHash().toHex()); result.put(ParamConstant.TX, RPCUtil.encode(tx.serialize())); return Result.getSuccess(SUCCESS).setData(result); } catch (IOException e) { diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/NulsCrossChainServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsCrossChainServiceImpl.java similarity index 78% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/NulsCrossChainServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsCrossChainServiceImpl.java index d041a0e2d7..c54dc79b03 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/NulsCrossChainServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsCrossChainServiceImpl.java @@ -1,11 +1,13 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.Result; +import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.constant.TxStatusEnum; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; @@ -18,31 +20,27 @@ import io.nuls.crosschain.base.model.dto.input.CoinDTO; import io.nuls.crosschain.base.model.dto.input.CrossTxTransferDTO; import io.nuls.crosschain.base.service.CrossChainService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.rpc.call.AccountCall; -import io.nuls.crosschain.nuls.rpc.call.BlockCall; -import io.nuls.crosschain.nuls.rpc.call.ChainManagerCall; -import io.nuls.crosschain.nuls.rpc.call.TransactionCall; -import io.nuls.crosschain.nuls.srorage.*; -import io.nuls.crosschain.nuls.utils.CommonUtil; -import io.nuls.crosschain.nuls.utils.LoggerUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; -import io.nuls.crosschain.nuls.utils.manager.CoinDataManager; -import io.nuls.crosschain.nuls.utils.thread.CrossTxHandler; -import io.nuls.crosschain.nuls.utils.validator.CrossTxValidator; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.rpc.call.AccountCall; +import io.nuls.crosschain.rpc.call.BlockCall; +import io.nuls.crosschain.rpc.call.ChainManagerCall; +import io.nuls.crosschain.rpc.call.TransactionCall; +import io.nuls.crosschain.srorage.*; +import io.nuls.crosschain.utils.CommonUtil; +import io.nuls.crosschain.utils.LoggerUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; +import io.nuls.crosschain.utils.manager.CoinDataManager; +import io.nuls.crosschain.utils.thread.CrossTxHandler; +import io.nuls.crosschain.utils.validator.CrossTxValidator; import java.io.IOException; import java.util.*; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.CHAIN_ID_MIN; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode.*; -import static io.nuls.crosschain.nuls.constant.ParamConstant.*; - /** * 跨链模块默认接口实现类 * @@ -55,7 +53,7 @@ public class NulsCrossChainServiceImpl implements CrossChainService { private ChainManager chainManager; @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private CoinDataManager coinDataManager; @@ -87,20 +85,20 @@ public class NulsCrossChainServiceImpl implements CrossChainService { @SuppressWarnings("unchecked") public Result createCrossTx(Map params) { if (params == null) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } CrossTxTransferDTO crossTxTransferDTO = JSONUtils.map2pojo(params, CrossTxTransferDTO.class); int chainId = crossTxTransferDTO.getChainId(); - if (chainId <= CHAIN_ID_MIN) { - return Result.getFailed(PARAMETER_ERROR); + if (chainId <= NulsCrossChainConstant.CHAIN_ID_MIN) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } if (!chainManager.isCrossNetUseAble()) { chain.getLogger().info("跨链网络组网异常！"); - return Result.getFailed(CROSS_CHAIN_NETWORK_UNAVAILABLE); + return Result.getFailed(NulsCrossChainErrorCode.CROSS_CHAIN_NETWORK_UNAVAILABLE); } Transaction tx = new Transaction(config.getCrossCtxType()); try { @@ -127,101 +125,101 @@ public Result createCrossTx(Map params) { } if (!txValidator.coinDataValid(chain, coinData, tx.size())) { chain.getLogger().error("跨链交易CoinData验证失败！\n\n"); - return Result.getFailed(COINDATA_VERIFY_FAIL); + return Result.getFailed(NulsCrossChainErrorCode.COINDATA_VERIFY_FAIL); } transactionSignature.setP2PHKSignatures(p2PHKSignatures); tx.setTransactionSignature(transactionSignature.serialize()); if (!TransactionCall.sendTx(chain, RPCUtil.encode(tx.serialize()))) { chain.getLogger().error("跨链交易发送交易模块失败\n\n"); - throw new NulsException(INTERFACE_CALL_FAILED); + throw new NulsException(NulsCrossChainErrorCode.INTERFACE_CALL_FAILED); } Map result = new HashMap<>(2); - result.put(TX_HASH, tx.getHash().toHex()); - return Result.getSuccess(SUCCESS).setData(result); + result.put(ParamConstant.TX_HASH, tx.getHash().toHex()); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(result); } catch (NulsException e) { chain.getLogger().error(e); return Result.getFailed(e.getErrorCode()); } catch (IOException e) { Log.error(e); - return Result.getFailed(SERIALIZE_ERROR); + return Result.getFailed(CommonCodeConstanst.SERIALIZE_ERROR); } } @Override @SuppressWarnings("unchecked") public Result newApiModuleCrossTx(Map params) { - if (params.get(CHAIN_ID) == null || params.get(TX) == null) { - return Result.getFailed(PARAMETER_ERROR); + if (params.get(ParamConstant.CHAIN_ID) == null || params.get(ParamConstant.TX) == null) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } - int chainId = (Integer) params.get(CHAIN_ID); + int chainId = (Integer) params.get(ParamConstant.CHAIN_ID); if (chainId <= 0) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } - String txStr = (String) params.get(TX); + String txStr = (String) params.get(ParamConstant.TX); try { Transaction tx = new Transaction(); tx.parse(RPCUtil.decode(txStr), 0); CoinData coinData = tx.getCoinDataInstance(); if (!txValidator.coinDataValid(chain, coinData, tx.size())) { chain.getLogger().error("跨链交易CoinData验证失败！\n\n"); - return Result.getFailed(COINDATA_VERIFY_FAIL); + return Result.getFailed(NulsCrossChainErrorCode.COINDATA_VERIFY_FAIL); } if (!TransactionCall.sendTx(chain, RPCUtil.encode(tx.serialize()))) { chain.getLogger().error("跨链交易发送交易模块失败\n\n"); - throw new NulsException(INTERFACE_CALL_FAILED); + throw new NulsException(NulsCrossChainErrorCode.INTERFACE_CALL_FAILED); } Map result = new HashMap<>(2); - result.put(TX_HASH, tx.getHash().toHex()); + result.put(ParamConstant.TX_HASH, tx.getHash().toHex()); result.put("success", true); - return Result.getSuccess(SUCCESS).setData(result); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(result); } catch (NulsException e) { chain.getLogger().error(e); return Result.getFailed(e.getErrorCode()); } catch (IOException e) { Log.error(e); - return Result.getFailed(SERIALIZE_ERROR); + return Result.getFailed(CommonCodeConstanst.SERIALIZE_ERROR); } } @Override @SuppressWarnings("unchecked") public Result validCrossTx(Map params) { - if (params.get(CHAIN_ID) == null || params.get(TX) == null) { - return Result.getFailed(PARAMETER_ERROR); + if (params.get(ParamConstant.CHAIN_ID) == null || params.get(ParamConstant.TX) == null) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } - int chainId = (Integer) params.get(CHAIN_ID); + int chainId = (Integer) params.get(ParamConstant.CHAIN_ID); if (chainId <= 0) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } - String txStr = (String) params.get(TX); + String txStr = (String) params.get(ParamConstant.TX); try { Transaction transaction = new Transaction(); transaction.parse(RPCUtil.decode(txStr), 0); if (!txValidator.validateTx(chain, transaction, null)) { chain.getLogger().error("跨链交易验证失败,Hash:{}\n", transaction.getHash().toHex()); - return Result.getFailed(TX_DATA_VALIDATION_ERROR); + return Result.getFailed(NulsCrossChainErrorCode.TX_DATA_VALIDATION_ERROR); } Map validResult = new HashMap<>(2); - validResult.put(VALUE, true); + validResult.put(ParamConstant.VALUE, true); chain.getLogger().info("跨链交易验证成功，Hash:{}\n", transaction.getHash().toHex()); - return Result.getSuccess(SUCCESS).setData(validResult); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(validResult); } catch (NulsException e) { chain.getLogger().error(e); return Result.getFailed(e.getErrorCode()); } catch (IOException e) { Log.error(e); - return Result.getFailed(SERIALIZE_ERROR); + return Result.getFailed(CommonCodeConstanst.SERIALIZE_ERROR); } } @@ -246,6 +244,7 @@ public boolean commitCrossTx(int chainId, List txs, BlockHeader blo int fromChainId = AddressTool.getChainIdByAddress(coinData.getFrom().get(0).getAddress()); int toChainId = AddressTool.getChainIdByAddress(coinData.getTo().get(0).getAddress()); if (chainId == toChainId) { + //跨入 NulsHash convertHash = ctxHash; if (!config.isMainNet()) { convertHash = TxUtil.friendConvertToMain(chain, ctx, TxType.CROSS_CHAIN).getHash(); @@ -261,6 +260,7 @@ public boolean commitCrossTx(int chainId, List txs, BlockHeader blo } otherCtxList.add(convertHash); } else { + //跨出 if (!config.isMainNet()) { NulsHash convertHash = TxUtil.friendConvertToMain(chain, ctx, TxType.CROSS_CHAIN).getHash(); if (!convertHashService.save(convertHash, ctxHash, chainId)) { @@ -417,23 +417,23 @@ public Map crossTxBatchValid(int chainId, List txs, @Override @SuppressWarnings("unchecked") public Result getCrossTxState(Map params) { - if (params.get(CHAIN_ID) == null || params.get(TX_HASH) == null) { - return Result.getFailed(PARAMETER_ERROR); + if (params.get(ParamConstant.CHAIN_ID) == null || params.get(ParamConstant.TX_HASH) == null) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } - int chainId = (Integer) params.get(CHAIN_ID); + int chainId = (Integer) params.get(ParamConstant.CHAIN_ID); if (chainId <= 0) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } - String hashStr = (String) params.get(TX_HASH); + String hashStr = (String) params.get(ParamConstant.TX_HASH); Map result = new HashMap<>(2); NulsHash requestHash = NulsHash.fromHex(hashStr); byte statisticsResult = TxUtil.getCtxState(chain, requestHash); - result.put(VALUE, statisticsResult); - return Result.getSuccess(SUCCESS).setData(result); + result.put(ParamConstant.VALUE, statisticsResult); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(result); } @Override @@ -441,8 +441,8 @@ public Result getCrossTxState(Map params) { public Result getRegisteredChainInfoList(Map params) { Map result = new HashMap<>(2); LoggerUtil.commonLog.info("------获取跨链资产信息---总长度：" + chainManager.getRegisteredCrossChainList().size()); - result.put(LIST, chainManager.getRegisteredCrossChainList()); - return Result.getSuccess(SUCCESS).setData(result); + result.put(ParamConstant.LIST, chainManager.getRegisteredCrossChainList()); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(result); } @Override @@ -453,20 +453,20 @@ public int getCrossChainTxType() { @Override @SuppressWarnings("unchecked") public Result getByzantineCount(Map params) { - if (params.get(CHAIN_ID) == null) { - return Result.getFailed(PARAMETER_ERROR); + if (params.get(ParamConstant.CHAIN_ID) == null) { + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } - int chainId = (Integer) params.get(CHAIN_ID); + int chainId = (Integer) params.get(ParamConstant.CHAIN_ID); if (chainId <= 0) { - return Result.getFailed(PARAMETER_ERROR); + return Result.getFailed(CommonCodeConstanst.PARAMETER_ERROR); } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } Map result = new HashMap<>(2); - result.put(VALUE, config.getByzantineRatio() * CommonUtil.getCurrentPackAddressList(chain).size() / NulsCrossChainConstant.MAGIC_NUM_100); - return Result.getSuccess(SUCCESS).setData(result); + result.put(ParamConstant.VALUE, config.getByzantineRatio() * CommonUtil.getCurrentPackAddressList(chain).size() / NulsCrossChainConstant.MAGIC_NUM_100); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(result); } private void rollbackCtx(List convertHashList, List ctxStatusList, List otherCtxList, int chainId) { diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/NulsProtocolServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsProtocolServiceImpl.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/NulsProtocolServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsProtocolServiceImpl.java index 170b6e4ba8..0d49ecb15a 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/NulsProtocolServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsProtocolServiceImpl.java @@ -1,9 +1,10 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxStatusEnum; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; @@ -15,24 +16,19 @@ import io.nuls.crosschain.base.message.*; import io.nuls.crosschain.base.model.bo.Circulation; import io.nuls.crosschain.base.service.ProtocolService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.CtxStateEnum; -import io.nuls.crosschain.nuls.model.bo.message.UntreatedMessage; -import io.nuls.crosschain.nuls.model.bo.message.WaitBroadSignMessage; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.rpc.call.LedgerCall; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.srorage.*; -import io.nuls.crosschain.nuls.utils.CommonUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.CtxStateEnum; +import io.nuls.crosschain.model.bo.message.UntreatedMessage; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.rpc.call.LedgerCall; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.srorage.*; +import io.nuls.crosschain.utils.CommonUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; /** @@ -46,7 +42,7 @@ public class NulsProtocolServiceImpl implements ProtocolService { @Autowired private ChainManager chainManager; @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private ConvertCtxService convertCtxService; @Autowired @@ -143,7 +139,8 @@ public void receiveCtxSign(int chainId, String nodeId, BroadCtxSignMessage messa UntreatedMessage untreatedSignMessage = new UntreatedMessage(chainId,nodeId,messageBody,localHash); chain.getFutureMessageMap().putIfAbsent(localHash, new ArrayList<>()); chain.getFutureMessageMap().get(localHash).add(untreatedSignMessage); - chain.getLogger().info("当前节点还未确认该跨链交易，缓存签名消息"); + //TODO pierre test + chain.getLogger().debug("当前节点还未确认该跨链交易，缓存签名消息"); return; } //如果交易在本节点已确认则无需再签名处理 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/RegisteredChainChangeServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/RegisteredChainChangeServiceImpl.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/RegisteredChainChangeServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/RegisteredChainChangeServiceImpl.java index da64f77d7f..d0116244d8 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/RegisteredChainChangeServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/RegisteredChainChangeServiceImpl.java @@ -1,8 +1,9 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; import io.nuls.base.signture.SignatureUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; @@ -11,14 +12,13 @@ import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainChangeData; import io.nuls.crosschain.base.service.RegisteredChainChangeService; import io.nuls.crosschain.base.utils.enumeration.ChainInfoChangeType; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.CommonUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.CommonUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; import java.util.*; @@ -28,7 +28,7 @@ public class RegisteredChainChangeServiceImpl implements RegisteredChainChangeSe private ChainManager chainManager; @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private RegisteredCrossChainService registeredCrossChainService; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetChainServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetChainServiceImpl.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetChainServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetChainServiceImpl.java index 5287a113ec..a44b539059 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetChainServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetChainServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; @@ -12,11 +12,11 @@ import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; import io.nuls.crosschain.base.model.bo.txdata.ResetChainInfoData; import io.nuls.crosschain.base.service.ResetChainService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.common.NulsCoresConfig; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.manager.ChainManager; import java.util.*; @@ -28,7 +28,7 @@ public class ResetChainServiceImpl implements ResetChainService { private ChainManager chainManager; @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private RegisteredCrossChainService registeredCrossChainService; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetLocalVerifierServiceImpl.java similarity index 88% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetLocalVerifierServiceImpl.java index 98646350a3..fb3e7291a3 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/ResetLocalVerifierServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetLocalVerifierServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import com.google.common.collect.Lists; import io.nuls.base.RPCUtil; @@ -6,6 +6,7 @@ import io.nuls.base.data.*; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.Result; import io.nuls.core.constant.CommonCodeConstanst; import io.nuls.core.constant.TxType; @@ -18,17 +19,17 @@ import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.crosschain.base.model.bo.ChainInfo; import io.nuls.crosschain.base.service.ResetLocalVerifierService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.*; -import io.nuls.crosschain.nuls.srorage.LocalVerifierService; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; -import io.nuls.crosschain.nuls.utils.manager.CoinDataManager; -import io.nuls.crosschain.nuls.utils.manager.LocalVerifierManager; -import io.nuls.crosschain.nuls.utils.thread.ResetOtherChainVerifierListHandler; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.*; +import io.nuls.crosschain.srorage.LocalVerifierService; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; +import io.nuls.crosschain.utils.manager.CoinDataManager; +import io.nuls.crosschain.utils.manager.LocalVerifierManager; +import io.nuls.crosschain.utils.thread.ResetOtherChainVerifierListHandler; import java.io.IOException; import java.math.BigInteger; @@ -37,9 +38,6 @@ import static io.nuls.base.basic.TransactionFeeCalculator.NORMAL_PRICE_PRE_1024_BYTES; import static io.nuls.core.constant.CommonCodeConstanst.PARAMETER_ERROR; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.CHAIN_ID_MIN; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode.*; -import static io.nuls.crosschain.nuls.constant.ParamConstant.TX_HASH; /** * @Author: zhoulijun @@ -56,7 +54,7 @@ public class ResetLocalVerifierServiceImpl implements ResetLocalVerifierService private CoinDataManager coinDataManager; @Autowired - NulsCrossChainConfig nulsCrossChainConfig; + NulsCoresConfig nulsCrossChainConfig; @Autowired LocalVerifierService localVerifierService; @@ -78,7 +76,7 @@ private CoinData assemblyCoinFrom(Chain chain, String addressStr) throws NulsExc if (!AddressTool.validAddress(chain.getChainId(), addressStr)) { //转账交易转出地址必须是本链地址 chain.getLogger().error("跨链交易转出账户不为本链账户"); - throw new NulsException(ADDRESS_IS_NOT_THE_CURRENT_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.ADDRESS_IS_NOT_THE_CURRENT_CHAIN); } int assetChainId = chain.getChainId(); int assetId = nulsCrossChainConfig.getAssetId(); @@ -88,7 +86,7 @@ private CoinData assemblyCoinFrom(Chain chain, String addressStr) throws NulsExc BigInteger balance = new BigInteger(result.get("available").toString()); if (BigIntegerUtils.isLessThan(balance, NORMAL_PRICE_PRE_1024_BYTES)) { chain.getLogger().error("账户余额不足"); - throw new NulsException(INSUFFICIENT_BALANCE); + throw new NulsException(NulsCrossChainErrorCode.INSUFFICIENT_BALANCE); } CoinData coinData = new CoinData(); coinData.setFrom(List.of(new CoinFrom(address, assetChainId, assetId, NORMAL_PRICE_PRE_1024_BYTES, nonce, NulsCrossChainConstant.UNLOCKED_TX))); @@ -103,7 +101,7 @@ private CoinData assemblyCoinFrom(Chain chain, String addressStr) throws NulsExc */ @Override public Result createResetLocalVerifierTx(int chainId, String address, String password) { - if (chainId <= CHAIN_ID_MIN) { + if (chainId <= NulsCrossChainConstant.CHAIN_ID_MIN) { return Result.getFailed(PARAMETER_ERROR); } if (StringUtils.isBlank(address) && StringUtils.isBlank(password)) { @@ -111,7 +109,7 @@ public Result createResetLocalVerifierTx(int chainId, String address, String pas } Chain chain = chainManager.getChainMap().get(chainId); if (chain == null) { - return Result.getFailed(CHAIN_NOT_EXIST); + return Result.getFailed(NulsCrossChainErrorCode.CHAIN_NOT_EXIST); } if (!nulsCrossChainConfig.getSeedNodeList().contains(address)) { return Result.getFailed(PARAMETER_ERROR); @@ -128,11 +126,11 @@ public Result createResetLocalVerifierTx(int chainId, String address, String pas tx.setTransactionSignature(transactionSignature.serialize()); if (!TransactionCall.sendTx(chain, RPCUtil.encode(tx.serialize()))) { chain.getLogger().error("重置本链验证人列表交易发送交易模块失败\n\n"); - throw new NulsException(INTERFACE_CALL_FAILED); + throw new NulsException(NulsCrossChainErrorCode.INTERFACE_CALL_FAILED); } Map result = new HashMap<>(2); - result.put(TX_HASH, tx.getHash().toHex()); - return Result.getSuccess(SUCCESS).setData(result); + result.put(ParamConstant.TX_HASH, tx.getHash().toHex()); + return Result.getSuccess(CommonCodeConstanst.SUCCESS).setData(result); }catch (NulsException e){ chain.getLogger().error("创建重置本链验证人列表交易时捕获异常",e); return Result.getFailed(e.getErrorCode()); @@ -169,13 +167,13 @@ public Map validate(int chainId, List txs, BlockHea //只能有一个from if (coinData.getFrom().size() != 1) { result.put("txList", txs); - result.put("errorCode", COINDATA_VERIFY_FAIL.getCode()); + result.put("errorCode", NulsCrossChainErrorCode.COINDATA_VERIFY_FAIL.getCode()); return result; } //必须是种子节点发出的交易 if (coinData.getFromAddressList().stream().noneMatch(d -> nulsCrossChainConfig.getSeedNodeList().contains(d))) { result.put("txList", txs); - result.put("errorCode", MUST_SEED_ADDRESS_SIGN.getCode()); + result.put("errorCode", NulsCrossChainErrorCode.MUST_SEED_ADDRESS_SIGN.getCode()); return result; } TransactionSignature transactionSignature = new TransactionSignature(); @@ -239,7 +237,9 @@ public boolean commitTx(int chainId, List txs, BlockHeader blockHea chain.getLogger().error("重置本链验证人列表失败"); return false; } - }finally { + } catch (Exception e) { + chain.getLogger().error(e.getMessage(), e); + } finally { chain.getSwitchVerifierLock().writeLock().unlock(); } chain.getLogger().info("重置本链验证人列表完成:{}",chain.getVerifierList()); diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/VerifierChangeTxServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/VerifierChangeTxServiceImpl.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/VerifierChangeTxServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/VerifierChangeTxServiceImpl.java index ff20f13145..8c9fe1baed 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/servive/impl/VerifierChangeTxServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/VerifierChangeTxServiceImpl.java @@ -1,30 +1,34 @@ -package io.nuls.crosschain.nuls.servive.impl; +package io.nuls.crosschain.servive.impl; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; import io.nuls.base.signture.SignatureUtil; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; +import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; import io.nuls.crosschain.base.model.bo.ChainInfo; +import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; import io.nuls.crosschain.base.model.bo.txdata.VerifierChangeData; import io.nuls.crosschain.base.service.VerifierChangeTxService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.BlockCall; -import io.nuls.crosschain.nuls.srorage.ConfigService; -import io.nuls.crosschain.nuls.srorage.ConvertHashService; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.CommonUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; -import io.nuls.crosschain.nuls.utils.manager.LocalVerifierManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.BlockCall; +import io.nuls.crosschain.srorage.ConvertHashService; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.CommonUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; +import io.nuls.crosschain.utils.manager.LocalVerifierManager; -import java.util.*; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 验证人变更交易实现类 @@ -35,15 +39,13 @@ @Component public class VerifierChangeTxServiceImpl implements VerifierChangeTxService { @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private ChainManager chainManager; @Autowired private ConvertHashService convertHashService; @Autowired private RegisteredCrossChainService registeredCrossChainService; - @Autowired - private ConfigService configService; @Override public Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { @@ -94,11 +96,11 @@ public Map validate(int chainId, List txs, Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader) { List invalidTxList = new ArrayList<>(); diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CommitedOtherCtxService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CommitedOtherCtxService.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CommitedOtherCtxService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CommitedOtherCtxService.java index fdbcfcbb36..00ba981039 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CommitedOtherCtxService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CommitedOtherCtxService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConvertCtxService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/ConvertCtxService.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConvertCtxService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/ConvertCtxService.java index 2dccbcfd64..5e4ed058cd 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConvertCtxService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/ConvertCtxService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConvertHashService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/ConvertHashService.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConvertHashService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/ConvertHashService.java index 0a85c9f3c6..91aae1ff44 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConvertHashService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/ConvertHashService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; import io.nuls.base.data.NulsHash; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CrossChangeBroadFailService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CrossChangeBroadFailService.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CrossChangeBroadFailService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CrossChangeBroadFailService.java index bc5bb1d4f7..e22f93bc50 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CrossChangeBroadFailService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CrossChangeBroadFailService.java @@ -1,5 +1,5 @@ -package io.nuls.crosschain.nuls.srorage; -import io.nuls.crosschain.nuls.model.po.VerifierChangeSendFailPO; +package io.nuls.crosschain.srorage; +import io.nuls.crosschain.model.po.VerifierChangeSendFailPO; import java.util.Map; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CtxStateService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CtxStateService.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CtxStateService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CtxStateService.java index 7339937cb7..0a4820ecee 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CtxStateService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CtxStateService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CtxStatusService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CtxStatusService.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CtxStatusService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CtxStatusService.java index 3cdae9bf76..4987808f6f 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/CtxStatusService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/CtxStatusService.java @@ -1,7 +1,7 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; import io.nuls.base.data.NulsHash; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; +import io.nuls.crosschain.model.po.CtxStatusPO; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/LocalVerifierService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/LocalVerifierService.java similarity index 85% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/LocalVerifierService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/LocalVerifierService.java index f7e080eae3..1055779971 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/LocalVerifierService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/LocalVerifierService.java @@ -1,9 +1,6 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; -import io.nuls.crosschain.nuls.model.po.LocalVerifierPO; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; - -import java.util.Map; +import io.nuls.crosschain.model.po.LocalVerifierPO; /** * 本地验证人列表相关操作 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/RegisteredCrossChainService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/RegisteredCrossChainService.java similarity index 94% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/RegisteredCrossChainService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/RegisteredCrossChainService.java index 3238bb53e7..bb064397be 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/RegisteredCrossChainService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/RegisteredCrossChainService.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/SendHeightService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/SendHeightService.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/SendHeightService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/SendHeightService.java index 34a08de4fe..bab3c0b9ae 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/SendHeightService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/SendHeightService.java @@ -1,5 +1,5 @@ -package io.nuls.crosschain.nuls.srorage; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; +package io.nuls.crosschain.srorage; +import io.nuls.crosschain.model.po.SendCtxHashPO; import java.util.Map; /** diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/SendedHeightService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/SendedHeightService.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/SendedHeightService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/SendedHeightService.java index 98deebbdd3..5633fbca94 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/SendedHeightService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/SendedHeightService.java @@ -1,6 +1,6 @@ -package io.nuls.crosschain.nuls.srorage; +package io.nuls.crosschain.srorage; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; +import io.nuls.crosschain.model.po.SendCtxHashPO; import java.util.Map; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/VerifierChangeBroadFailedService.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/VerifierChangeBroadFailedService.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/VerifierChangeBroadFailedService.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/VerifierChangeBroadFailedService.java index b15e4e724f..f17c3786c6 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/VerifierChangeBroadFailedService.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/VerifierChangeBroadFailedService.java @@ -1,5 +1,5 @@ -package io.nuls.crosschain.nuls.srorage; -import io.nuls.crosschain.nuls.model.po.VerifierChangeSendFailPO; +package io.nuls.crosschain.srorage; +import io.nuls.crosschain.model.po.VerifierChangeSendFailPO; import java.util.Map; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CommitedOtherCtxServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CommitedOtherCtxServiceImpl.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CommitedOtherCtxServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CommitedOtherCtxServiceImpl.java index 0a5e9a631b..9529c88102 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CommitedOtherCtxServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CommitedOtherCtxServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; @@ -6,8 +6,8 @@ import io.nuls.core.log.Log; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.srorage.CommitedOtherCtxService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.srorage.CommitedOtherCtxService; import java.util.ArrayList; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConvertCtxServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/ConvertCtxServiceImpl.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConvertCtxServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/ConvertCtxServiceImpl.java index 40a87a479f..3674dc8077 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConvertCtxServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/ConvertCtxServiceImpl.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; @@ -6,8 +6,8 @@ import io.nuls.core.log.Log; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.srorage.ConvertCtxService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.srorage.ConvertCtxService; import java.util.ArrayList; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConvertHashServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/ConvertHashServiceImpl.java similarity index 93% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConvertHashServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/ConvertHashServiceImpl.java index 6e9eb1114c..edd173d014 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConvertHashServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/ConvertHashServiceImpl.java @@ -1,12 +1,12 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.base.data.NulsHash; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.srorage.ConvertHashService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.srorage.ConvertHashService; import java.util.ArrayList; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CrossChangeBroadFailServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CrossChangeBroadFailServiceImpl.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CrossChangeBroadFailServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CrossChangeBroadFailServiceImpl.java index ca33b7482d..080949b281 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CrossChangeBroadFailServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CrossChangeBroadFailServiceImpl.java @@ -1,13 +1,13 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.model.ByteUtils; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.po.VerifierChangeSendFailPO; -import io.nuls.crosschain.nuls.srorage.CrossChangeBroadFailService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.VerifierChangeSendFailPO; +import io.nuls.crosschain.srorage.CrossChangeBroadFailService; import java.util.HashMap; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CtxStateServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CtxStateServiceImpl.java similarity index 88% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CtxStateServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CtxStateServiceImpl.java index 483a017f06..38af745492 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CtxStateServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CtxStateServiceImpl.java @@ -1,9 +1,8 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Component; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.srorage.CtxStateService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.srorage.CtxStateService; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.core.annotation.Service; import io.nuls.core.log.Log; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CtxStatusServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CtxStatusServiceImpl.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CtxStatusServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CtxStatusServiceImpl.java index 1fce66fd80..5181995569 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/CtxStatusServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/CtxStatusServiceImpl.java @@ -1,13 +1,13 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.base.data.NulsHash; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.srorage.CtxStatusService; import java.util.ArrayList; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/LocalVerifierServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/LocalVerifierServiceImpl.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/LocalVerifierServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/LocalVerifierServiceImpl.java index 60374b730b..58680866ac 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/LocalVerifierServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/LocalVerifierServiceImpl.java @@ -1,12 +1,12 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.model.ByteUtils; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.po.LocalVerifierPO; -import io.nuls.crosschain.nuls.srorage.LocalVerifierService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.LocalVerifierPO; +import io.nuls.crosschain.srorage.LocalVerifierService; @Component public class LocalVerifierServiceImpl implements LocalVerifierService { diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/RegisteredCrossChainServiceImpl.java similarity index 89% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/RegisteredCrossChainServiceImpl.java index 8da5113e7e..19afeaf967 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/RegisteredCrossChainServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/RegisteredCrossChainServiceImpl.java @@ -1,14 +1,14 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.LoggerUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.LoggerUtil; +import io.nuls.crosschain.utils.manager.ChainManager; /** * 已注册跨链的交易数据库操作实现类 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/SendHeightServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/SendHeightServiceImpl.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/SendHeightServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/SendHeightServiceImpl.java index da7774758f..3425030696 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/SendHeightServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/SendHeightServiceImpl.java @@ -1,8 +1,8 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Component; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; -import io.nuls.crosschain.nuls.srorage.SendHeightService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import io.nuls.crosschain.srorage.SendHeightService; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.log.Log; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/SendedHeightServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/SendedHeightServiceImpl.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/SendedHeightServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/SendedHeightServiceImpl.java index 3e0217a2f5..98701b55a9 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/SendedHeightServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/SendedHeightServiceImpl.java @@ -1,9 +1,9 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Component; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; -import io.nuls.crosschain.nuls.srorage.SendedHeightService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import io.nuls.crosschain.srorage.SendedHeightService; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.log.Log; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/VerifierChangeBroadFailedServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/VerifierChangeBroadFailedServiceImpl.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/VerifierChangeBroadFailedServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/VerifierChangeBroadFailedServiceImpl.java index 382a5d1ad3..eaea2e8e29 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/VerifierChangeBroadFailedServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/srorage/imp/VerifierChangeBroadFailedServiceImpl.java @@ -1,13 +1,13 @@ -package io.nuls.crosschain.nuls.srorage.imp; +package io.nuls.crosschain.srorage.imp; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.model.ByteUtils; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.po.VerifierChangeSendFailPO; -import io.nuls.crosschain.nuls.srorage.VerifierChangeBroadFailedService; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.VerifierChangeSendFailPO; +import io.nuls.crosschain.srorage.VerifierChangeBroadFailedService; import java.util.HashMap; import java.util.List; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/BroadCtxUtil.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/BroadCtxUtil.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/BroadCtxUtil.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/BroadCtxUtil.java index 0f80fcdda6..568c80fe9a 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/BroadCtxUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/BroadCtxUtil.java @@ -1,8 +1,9 @@ -package io.nuls.crosschain.nuls.utils; +package io.nuls.crosschain.utils; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -13,13 +14,12 @@ import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainChangeData; import io.nuls.crosschain.base.model.bo.txdata.VerifierInitData; import io.nuls.crosschain.base.utils.enumeration.ChainInfoChangeType; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.model.bo.BroadFailFlag; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.po.VerifierChangeSendFailPO; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.srorage.*; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.model.bo.BroadFailFlag; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.po.VerifierChangeSendFailPO; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.srorage.*; +import io.nuls.crosschain.utils.manager.ChainManager; import java.io.IOException; import java.util.HashSet; @@ -34,7 +34,7 @@ public class BroadCtxUtil { @Autowired private static SendHeightService sendHeightService; @Autowired - private static NulsCrossChainConfig config; + private static NulsCoresConfig config; @Autowired private static ConvertCtxService convertCtxService; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/CommonUtil.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/CommonUtil.java similarity index 92% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/CommonUtil.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/CommonUtil.java index 192c7b6845..1ba2b1142e 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/CommonUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/CommonUtil.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.utils; +package io.nuls.crosschain.utils; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -8,23 +8,18 @@ import io.nuls.base.data.Transaction; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; import io.nuls.core.model.StringUtils; -import io.nuls.crosschain.base.model.bo.ChainInfo; import io.nuls.crosschain.base.model.bo.txdata.VerifierChangeData; -import io.nuls.crosschain.base.model.bo.txdata.VerifierInitData; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.srorage.ConfigService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.ConsensusCall; import java.util.*; import java.util.stream.Collectors; @@ -38,7 +33,7 @@ @Component public class CommonUtil { @Autowired - private static NulsCrossChainConfig config; + private static NulsCoresConfig config; /** * RPCUtil 反序列化 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/LoggerUtil.java similarity index 83% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/LoggerUtil.java index 621c35e665..8cfd6c6ee4 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/LoggerUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/LoggerUtil.java @@ -1,10 +1,9 @@ -package io.nuls.crosschain.nuls.utils; +package io.nuls.crosschain.utils; import io.nuls.core.rpc.model.ModuleE; -import io.nuls.crosschain.nuls.model.bo.Chain; +import io.nuls.crosschain.model.bo.Chain; import io.nuls.core.log.logback.LoggerBuilder; import io.nuls.core.log.logback.NulsLogger; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.*; /** * 日志管理类 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/MessageUtil.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/MessageUtil.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/MessageUtil.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/MessageUtil.java index db5aae7d18..64ad759c0c 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/MessageUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/MessageUtil.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.utils; +package io.nuls.crosschain.utils; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -8,6 +8,7 @@ import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.SignatureUtil; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxStatusEnum; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; @@ -15,34 +16,30 @@ import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; -import io.nuls.core.model.BigIntegerUtils; import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.constant.CrossChainConstant; import io.nuls.crosschain.base.message.BroadCtxSignMessage; import io.nuls.crosschain.base.message.GetOtherCtxMessage; import io.nuls.crosschain.base.model.bo.ChainInfo; -import io.nuls.crosschain.base.model.bo.txdata.CrossTransferData; import io.nuls.crosschain.base.model.bo.txdata.VerifierChangeData; import io.nuls.crosschain.base.service.ResetLocalVerifierService; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.NodeType; -import io.nuls.crosschain.nuls.model.bo.message.WaitBroadSignMessage; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.rpc.call.TransactionCall; -import io.nuls.crosschain.nuls.srorage.ConvertCtxService; -import io.nuls.crosschain.nuls.srorage.ConvertHashService; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; -import io.nuls.crosschain.nuls.srorage.SendHeightService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.NodeType; +import io.nuls.crosschain.model.bo.message.WaitBroadSignMessage; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import io.nuls.crosschain.rpc.call.ConsensusCall; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.rpc.call.TransactionCall; +import io.nuls.crosschain.srorage.ConvertCtxService; +import io.nuls.crosschain.srorage.ConvertHashService; +import io.nuls.crosschain.srorage.CtxStatusService; +import io.nuls.crosschain.srorage.SendHeightService; +import io.nuls.crosschain.utils.manager.ChainManager; import java.io.IOException; -import java.sql.ResultSet; import java.util.*; /** @@ -59,7 +56,7 @@ public class MessageUtil { private static ConvertHashService convertHashService; @Autowired - private static NulsCrossChainConfig config; + private static NulsCoresConfig config; @Autowired private static ChainManager chainManager; @@ -183,17 +180,17 @@ public static void signByzantine(Chain chain, int chainId, NulsHash realHash, Tr if (ctx.getType() == TxType.VERIFIER_INIT) { String txHash = realHash.toHex(); //这是一笔特殊的初始化验证人交易，用户重置平行链上存储的主网验证人列表 - if(resetLocalVerifierService.isResetOtherVerifierTx(txHash)){ + if (resetLocalVerifierService.isResetOtherVerifierTx(txHash)) { packAddressList = chain.getVerifierList(); //1为上浮到全部 signCountOverflow = 1F; - }else{ + } else { packAddressList = (List) ConsensusCall.getSeedNodeList(chain).get(ParamConstant.PARAM_PACK_ADDRESS_LIST); } } else { packAddressList = chain.getVerifierList(); } - signByzantineInChain(chain, ctx, signature, packAddressList, realHash,signCountOverflow); + signByzantineInChain(chain, ctx, signature, packAddressList, realHash, signCountOverflow); NetWorkCall.broadcast(chainId, messageBody, excludeNodes, CommandConstant.BROAD_CTX_SIGN_MESSAGE, false); chain.getLogger().info("将新收到的跨链交易签名广播给链接到的其他节点,Hash:{},签名:{}\n\n", nativeHex, signHex); } @@ -213,9 +210,9 @@ public static boolean signByzantineInChain( TransactionSignature signature, List packAddressList, NulsHash realHash, - Float signCountOverflow) throws NulsException, IOException{ + Float signCountOverflow) throws NulsException, IOException { if (ctx.getType() == TxType.VERIFIER_INIT) { - return verifierInitLocalByzantine(chain, ctx, signature, packAddressList, realHash,signCountOverflow); + return verifierInitLocalByzantine(chain, ctx, signature, packAddressList, realHash, signCountOverflow); } else if (ctx.getType() == TxType.VERIFIER_CHANGE) { return verifierChangeLocalByzantine(chain, ctx, signature, realHash); } else { @@ -238,19 +235,20 @@ public static boolean signByzantineInChain( TransactionSignature signature, List packAddressList, NulsHash realHash) throws NulsException, IOException { - return signByzantineInChain(chain,ctx,signature,packAddressList,realHash,0F); + return signByzantineInChain(chain, ctx, signature, packAddressList, realHash, 0F); } /** * 验证人初始化交易本地拜占庭签名 + * * @param chain * @param ctx * @param signature * @param packAddressList * @param realHash - * @param signCountOverflow 饱和签名上浮的幅度 0.3 在达到最低签名数后再上浮数量（上浮数量等于 总签名数减去最低签名数后的百分比） - * 示例： 总签名数100，最低签名数60，上浮 0.3 就等于 （100 - 60）* 0.3 = 12 ，则饱和签名数为 72. - * 当签名数达到60后，就会想其他链广播交易，当签名数达到72后，停止处理签名。 + * @param signCountOverflow 饱和签名上浮的幅度 0.3 在达到最低签名数后再上浮数量（上浮数量等于 总签名数减去最低签名数后的百分比） + * 示例： 总签名数100，最低签名数60，上浮 0.3 就等于 （100 - 60）* 0.3 = 12 ，则饱和签名数为 72. + * 当签名数达到60后，就会想其他链广播交易，当签名数达到72后，停止处理签名。 * @return * @throws IOException */ @@ -260,7 +258,7 @@ public static boolean verifierInitLocalByzantine( TransactionSignature signature, List packAddressList, NulsHash realHash, - Float signCountOverflow) throws IOException { + Float signCountOverflow) throws IOException { List handleAddressList = new ArrayList<>(packAddressList); int agentCount = handleAddressList.size(); //交易签名拜占庭 @@ -279,16 +277,16 @@ public static boolean verifierInitLocalByzantine( } saveCtxSendHeight(chain, sendHeight, ctx); chain.getLogger().info("初始化验证人交易签名拜占庭验证通过,保存验证人变更高度等待广播，Hash{},广播高度{}", ctx.getHash().toHex(), sendHeight); - if(signCountOverflow == null){ + if (signCountOverflow == null) { signCountOverflow = 0F; } - int fullByzantineCount = byzantineCount + (int)((agentCount - byzantineCount) * signCountOverflow); - if(signCount >= fullByzantineCount){ - chain.getLogger().info("初始化验证人交易签名数达到饱和签名数:{}，ctx设置为CONFIRMED状态，本节点不再处理此交易",signCount); + int fullByzantineCount = byzantineCount + (int) ((agentCount - byzantineCount) * signCountOverflow); + if (signCount >= fullByzantineCount) { + chain.getLogger().info("初始化验证人交易签名数达到饱和签名数:{}，ctx设置为CONFIRMED状态，本节点不再处理此交易", signCount); ctxStatusPO.setStatus(TxStatusEnum.CONFIRMED.getStatus()); resetLocalVerifierService.finishResetOtherVerifierTx(realHash.toHex()); - }else{ - chain.getLogger().debug("初始化验证人交易签名数达到最低签名数:{}，但为达到饱和签名数:{}，本节点将继续处理此交易",signCount,fullByzantineCount); + } else { + chain.getLogger().debug("初始化验证人交易签名数达到最低签名数:{}，但为达到饱和签名数:{}，本节点将继续处理此交易", signCount, fullByzantineCount); } ctxStatusService.save(realHash, ctxStatusPO, chain.getChainId()); return true; @@ -345,6 +343,7 @@ private static boolean verifierChangeLocalByzantine(Chain chain, Transaction ctx /** * 跨链交易 + * * @param chain * @param ctx * @param signature @@ -381,18 +380,18 @@ private static boolean crossTransferLocalByzantine( if (signCount >= byzantineCount) { ctx.setTransactionSignature(signature.serialize()); saveCtxSendHeight(chain, broadHeight, ctx); - chain.getLogger().info("跨链交易拜占庭完成，放入待打包队列，等待广播，Hash:{},sendHeight:{},txType:{}",ctx.getHash().toHex(), broadHeight, ctx.getType()); + chain.getLogger().info("跨链交易拜占庭完成，放入待打包队列，等待广播，Hash:{},sendHeight:{},txType:{}", ctx.getHash().toHex(), broadHeight, ctx.getType()); //饱和签名数，在最低签名数的基础上上浮5% float overflow = (agentCount - byzantineCount) * .05F; - int fullByzantineCount = byzantineCount + (int)(Math.ceil(overflow)); - if(fullByzantineCount > agentCount){ + int fullByzantineCount = byzantineCount + (int) (Math.ceil(overflow)); + if (fullByzantineCount > agentCount) { fullByzantineCount = agentCount; } - if(signCount >= fullByzantineCount){ - chain.getLogger().info("跨链交易签名数达到饱和签名数:{}，ctx设置为CONFIRMED状态，本节点不再处理此交易",signCount); + if (signCount >= fullByzantineCount) { + chain.getLogger().info("跨链交易签名数达到饱和签名数:{}，ctx设置为CONFIRMED状态，本节点不再处理此交易", signCount); ctxStatusPO.setStatus(TxStatusEnum.CONFIRMED.getStatus()); - }else{ - chain.getLogger().debug("跨链交易签名数达到最低签名数:{}，但为达到饱和签名数:{}，本节点将继续处理此交易",signCount,fullByzantineCount); + } else { + chain.getLogger().debug("跨链交易签名数达到最低签名数:{}，但为达到饱和签名数:{}，本节点将继续处理此交易", signCount, fullByzantineCount); } ctxStatusService.save(realHash, ctxStatusPO, chain.getChainId()); return true; @@ -417,7 +416,7 @@ private static boolean crossTransferLocalByzantine( public static boolean handleOtherChainCtx(Transaction ctx, Chain chain, int fromChainId) { NulsHash ctxHash = ctx.getHash(); try { - if(ctx.getType() == TxType.REGISTERED_CHAIN_CHANGE && config.isMainNet()){ + if (ctx.getType() == TxType.REGISTERED_CHAIN_CHANGE && config.isMainNet()) { return false; } TransactionSignature signature = new TransactionSignature(); @@ -435,12 +434,12 @@ public static boolean handleOtherChainCtx(Transaction ctx, Chain chain, int from if (!handleOtherChainVerifierChangeTx(chain, ctx, signature, verifierChainId)) { return false; } - } else if(ctx.getType() == TxType.VERIFIER_INIT){ + } else if (ctx.getType() == TxType.VERIFIER_INIT) { if (!handleOtherChainVerifierInitTx(chain, ctx, signature, verifierChainId)) { return false; } - }else{ - if(!handleOtherChainCrossTx(chain, ctx, signature, verifierChainId)){ + } else { + if (!handleOtherChainCrossTx(chain, ctx, signature, verifierChainId)) { return false; } } @@ -631,9 +630,10 @@ private static boolean otherCtxSignValidate(Chain chain, Transaction ctx, Transa } } if (passCount < minPassCount) { - chain.getLogger().error("签名验证通过数量小于拜占庭验证最小数量,passCount{},minPassCount{}", passCount, minPassCount); + chain.getLogger().error("签名验证通过数量小于拜占庭验证最小数量,passCount:{},minPassCount:{}", passCount, minPassCount); return false; } + chain.getLogger().info("签名验证通过,passCount:{},minPassCount:{}, of: {}", passCount, minPassCount, ctx.getHash().toHex()); return true; } diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/TxUtil.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/TxUtil.java index c3ec6a7a90..1abafbb83b 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/TxUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/TxUtil.java @@ -1,9 +1,10 @@ -package io.nuls.crosschain.nuls.utils; +package io.nuls.crosschain.utils; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxStatusEnum; import io.nuls.core.constant.TxType; import io.nuls.core.core.annotation.Autowired; @@ -18,21 +19,20 @@ import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainChangeData; import io.nuls.crosschain.base.model.bo.txdata.VerifierChangeData; import io.nuls.crosschain.base.model.bo.txdata.VerifierInitData; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.CtxStateEnum; -import io.nuls.crosschain.nuls.model.bo.message.WaitBroadSignMessage; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.rpc.call.AccountCall; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.srorage.ConvertCtxService; -import io.nuls.crosschain.nuls.srorage.ConvertHashService; -import io.nuls.crosschain.nuls.srorage.CtxStateService; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.ParamConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.CtxStateEnum; +import io.nuls.crosschain.model.bo.message.WaitBroadSignMessage; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.rpc.call.AccountCall; +import io.nuls.crosschain.rpc.call.ConsensusCall; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.srorage.ConvertCtxService; +import io.nuls.crosschain.srorage.ConvertHashService; +import io.nuls.crosschain.srorage.CtxStateService; +import io.nuls.crosschain.srorage.CtxStatusService; +import io.nuls.crosschain.utils.manager.ChainManager; import java.io.IOException; import java.math.BigInteger; @@ -49,7 +49,7 @@ @Component public class TxUtil { @Autowired - private static NulsCrossChainConfig config; + private static NulsCoresConfig config; @Autowired private static ConvertCtxService convertCtxService; @Autowired diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/ChainManager.java similarity index 89% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/ChainManager.java index e685d39f6e..22fde3684c 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/ChainManager.java @@ -1,30 +1,29 @@ -package io.nuls.crosschain.nuls.utils.manager; +package io.nuls.crosschain.utils.manager; import io.nuls.base.data.BlockHeader; -import io.nuls.base.protocol.ProtocolLoader; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; import io.nuls.crosschain.base.model.bo.ChainInfo; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.CmdRegisterDto; -import io.nuls.crosschain.nuls.model.bo.config.ConfigBean; -import io.nuls.crosschain.nuls.rpc.call.BlockCall; -import io.nuls.crosschain.nuls.rpc.call.SmartContractCall; -import io.nuls.crosschain.nuls.srorage.ConfigService; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.LoggerUtil; -import io.nuls.crosschain.nuls.utils.thread.handler.*; +import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.CmdRegisterDto; +import io.nuls.crosschain.rpc.call.BlockCall; +import io.nuls.crosschain.rpc.call.SmartContractCall; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.LoggerUtil; +import io.nuls.crosschain.utils.thread.handler.GetCtxStateHandler; +import io.nuls.crosschain.utils.thread.handler.HashMessageHandler; +import io.nuls.crosschain.utils.thread.handler.OtherCtxMessageHandler; +import io.nuls.crosschain.utils.thread.handler.SignMessageByzantineHandler; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.DB_NAME_OLD_LOCAL_VERIFIER; - /** * 链管理类,负责各条链的初始化,运行,启动,参数维护等 * Chain management class, responsible for the initialization, operation, start-up, parameter maintenance of each chain, etc. @@ -35,9 +34,7 @@ @Component public class ChainManager { @Autowired - private ConfigService configService; - @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private RegisteredCrossChainService registeredCrossChainService; /** @@ -89,7 +86,6 @@ public void initChain() throws Exception { */ initTable(chain); chainMap.put(chainId, chain); - ProtocolLoader.load(chainId); } if(!config.isMainNet()){ @@ -159,7 +155,7 @@ private Map configChain() { 读取数据库链信息配置 Read database chain information configuration */ - Map configMap = configService.getList(); + Map configMap = new HashMap<>(); /* 如果系统是第一次运行，则本地数据库没有存储链信息，此时需要从配置文件读取主链配置信息 If the system is running for the first time, the local database does not have chain information, @@ -172,10 +168,7 @@ private Map configChain() { }else{ configBean.setVerifierSet(new HashSet<>()); } - boolean saveSuccess = configService.save(configBean,configBean.getChainId()); - if(saveSuccess){ - configMap.put(configBean.getChainId(), configBean); - } + configMap.put(configBean.getChainId(), configBean); } return configMap; } catch (Exception e) { @@ -267,7 +260,7 @@ private void initTable(Chain chain) { /* 使用重置本链验证人列表交易重置本链验证人后，将改变前的验证人列表存在此表中 */ - RocksDBService.createTable(DB_NAME_OLD_LOCAL_VERIFIER + chainId); + RocksDBService.createTable(NulsCrossChainConstant.DB_NAME_OLD_LOCAL_VERIFIER + chainId); } catch (Exception e) { LoggerUtil.commonLog.error(e.getMessage()); diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/CoinDataManager.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/CoinDataManager.java similarity index 91% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/CoinDataManager.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/CoinDataManager.java index c69b334889..e5583ca947 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/CoinDataManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/CoinDataManager.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.utils.manager; +package io.nuls.crosschain.utils.manager; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -8,24 +8,22 @@ import io.nuls.base.data.CoinFrom; import io.nuls.base.data.CoinTo; import io.nuls.base.signture.P2PHKSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.model.BigIntegerUtils; import io.nuls.crosschain.base.model.bo.ChainInfo; import io.nuls.crosschain.base.model.dto.input.CoinDTO; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.AccountCall; -import io.nuls.crosschain.nuls.rpc.call.LedgerCall; -import io.nuls.crosschain.nuls.utils.CommonUtil; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.LedgerCall; +import io.nuls.crosschain.utils.CommonUtil; import java.math.BigInteger; import java.util.*; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode.*; - /** * 跨链模块CoinData管理类 * @@ -34,7 +32,7 @@ @Component public class CoinDataManager { @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private ChainManager chainManager; @@ -57,23 +55,23 @@ public List assemblyCoinFrom(Chain chain, List listFrom, bool multiAddress = address; } else if (!Arrays.equals(multiAddress, address)) { chain.getLogger().error("不支持多签账户多账户转账"); - throw new NulsException(ONLY_ONE_MULTI_SIGNATURE_ADDRESS_ALLOWED); + throw new NulsException(NulsCrossChainErrorCode.ONLY_ONE_MULTI_SIGNATURE_ADDRESS_ALLOWED); } if (!AddressTool.isMultiSignAddress(address)) { chain.getLogger().error("普通账户不允许发送多签账户转账交易"); - throw new NulsException(IS_NOT_MULTI_SIGNATURE_ADDRESS); + throw new NulsException(NulsCrossChainErrorCode.IS_NOT_MULTI_SIGNATURE_ADDRESS); } } else { //不是多签交易，from中不能有多签地址 if (AddressTool.isMultiSignAddress(address)) { chain.getLogger().error("普通账户转账中不允许包含多签账户"); - throw new NulsException(IS_MULTI_SIGNATURE_ADDRESS); + throw new NulsException(NulsCrossChainErrorCode.IS_MULTI_SIGNATURE_ADDRESS); } } if (!AddressTool.validAddress(chain.getChainId(), addressStr)) { //转账交易转出地址必须是本链地址 chain.getLogger().error("跨链交易转出账户不为本链账户"); - throw new NulsException(ADDRESS_IS_NOT_THE_CURRENT_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.ADDRESS_IS_NOT_THE_CURRENT_CHAIN); } int assetChainId = coinDTO.getAssetsChainId(); int assetId = coinDTO.getAssetsId(); @@ -84,7 +82,7 @@ public List assemblyCoinFrom(Chain chain, List listFrom, bool BigInteger balance = new BigInteger(result.get("available").toString()); if (BigIntegerUtils.isLessThan(balance, amount)) { chain.getLogger().error("账户余额不足"); - throw new NulsException(INSUFFICIENT_BALANCE); + throw new NulsException(NulsCrossChainErrorCode.INSUFFICIENT_BALANCE); } CoinFrom coinFrom = new CoinFrom(address, assetChainId, assetId, amount, nonce, NulsCrossChainConstant.CORSS_TX_LOCKED); coinFroms.add(coinFrom); @@ -110,7 +108,7 @@ public List assemblyCoinTo(List listTo,Chain chain) throws Nuls } else { if (receiveChainId != AddressTool.getChainIdByAddress(address)) { chain.getLogger().error("存在多条连收款方"); - throw new NulsException(CROSS_TX_PAYEE_CHAIN_NOT_SAME); + throw new NulsException(NulsCrossChainErrorCode.CROSS_TX_PAYEE_CHAIN_NOT_SAME); } } CoinTo coinTo = new CoinTo(); @@ -135,7 +133,7 @@ public List assemblyCoinTo(List listTo,Chain chain) throws Nuls public void verifyCoin(List coinFromList, List coinToList,Chain chain) throws NulsException { if (coinFromList.size() == 0 || coinToList.size() == 0) { chain.getLogger().error("付款方或收款方为空"); - throw new NulsException(COINDATA_IS_INCOMPLETE); + throw new NulsException(NulsCrossChainErrorCode.COINDATA_IS_INCOMPLETE); } byte[] toAddress = coinToList.get(0).getAddress(); int toChainId = AddressTool.getChainIdByAddress(toAddress); @@ -144,7 +142,7 @@ public void verifyCoin(List coinFromList, List coinToList,Chai //from和to地址是同一链的地址，则不能创建跨链交易 if (fromChainId == toChainId) { chain.getLogger().error("跨链交易付款方和收款方不能为同一条链账户"); - throw new NulsException(PAYEE_AND_PAYER_IS_THE_SAME_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.PAYEE_AND_PAYER_IS_THE_SAME_CHAIN); } //发起链和接收链是否已注册 if (!chain.isMainChain()) { @@ -163,11 +161,11 @@ public void verifyCoin(List coinFromList, List coinToList,Chai } if (!fromChainRegistered) { chain.getLogger().error("本链{}还未注册跨链", fromChainId); - throw new NulsException(CURRENT_CHAIN_UNREGISTERED_CROSS_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.CURRENT_CHAIN_UNREGISTERED_CROSS_CHAIN); } if (!toChainRegistered) { chain.getLogger().error("目标链{}还未注册跨链", toChainId); - throw new NulsException(TARGET_CHAIN_UNREGISTERED_CROSS_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.TARGET_CHAIN_UNREGISTERED_CROSS_CHAIN); } Set verifiedAssets = new HashSet<>(); for (Coin coin : coinFromList) { @@ -182,7 +180,7 @@ public void verifyCoin(List coinFromList, List coinToList,Chai } if (!assetAvailable) { chain.getLogger().error("链{}的资产{}未注册跨链", coin.getAssetsChainId(), coin.getAssetsId()); - throw new NulsException(ASSET_UNREGISTERED_CROSS_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.ASSET_UNREGISTERED_CROSS_CHAIN); } verifiedAssets.add(key); } @@ -240,7 +238,7 @@ public CoinData getCrossCoinData(Chain chain, List listFrom, List listFrom, List listFrom, List listFrom, List listFrom, List l if (BigIntegerUtils.isLessThan(actualFee, BigInteger.ZERO)) { chain.getLogger().error("转出金额小于转入金额"); //所有from中账户的余额总和小于to的总和，不够支付手续费 - throw new NulsException(INSUFFICIENT_FEE); + throw new NulsException(NulsCrossChainErrorCode.INSUFFICIENT_FEE); } else if (BigIntegerUtils.isLessThan(actualFee, targetFee)) { //先从有手续费资产的账户收取 actualFee = getFeeDirect(chain, listFrom, targetFee, actualFee, isMainNet); @@ -332,7 +330,7 @@ public CoinData getCoinData(Chain chain, List listFrom, List l if (!getFeeIndirect(chain, listFrom, txSize, targetFee, actualFee, isMainNet)) { chain.getLogger().error("余额不足"); //所有from中账户的余额总和都不够支付手续费 - throw new NulsException(INSUFFICIENT_FEE); + throw new NulsException(NulsCrossChainErrorCode.INSUFFICIENT_FEE); } } } diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/LocalVerifierManager.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/LocalVerifierManager.java similarity index 89% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/LocalVerifierManager.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/LocalVerifierManager.java index 1045238827..b9a79ef2c8 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/manager/LocalVerifierManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/manager/LocalVerifierManager.java @@ -1,21 +1,20 @@ -package io.nuls.crosschain.nuls.utils.manager; +package io.nuls.crosschain.utils.manager; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; import io.nuls.core.constant.TxStatusEnum; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.model.po.LocalVerifierPO; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; -import io.nuls.crosschain.nuls.srorage.CtxStateService; -import io.nuls.crosschain.nuls.srorage.CtxStatusService; -import io.nuls.crosschain.nuls.srorage.LocalVerifierService; -import io.nuls.crosschain.nuls.srorage.SendHeightService; -import org.checkerframework.checker.units.qual.C; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.model.po.LocalVerifierPO; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import io.nuls.crosschain.srorage.CtxStatusService; +import io.nuls.crosschain.srorage.LocalVerifierService; +import io.nuls.crosschain.srorage.SendHeightService; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @Component @@ -102,7 +101,10 @@ public static boolean localVerifierChangeCommit(Chain chain, Transaction ctx, Li chain.setLastChangeHeight(height); chain.setVerifierChangeTx(null); return true; - }finally { + } catch (Exception e) { + chain.getLogger().error(e.getMessage(), e); + return false; + } finally { chain.getSwitchVerifierLock().writeLock().unlock(); } } @@ -142,7 +144,10 @@ public static boolean localVerifierChangeRollback(Chain chain, List redu chain.setVerifierList(localVerifierPO.getVerifierList()); chain.setLastChangeHeight(height - 1); return true; - }finally { + } catch (Exception e) { + chain.getLogger().error(e.getMessage(), e); + return false; + } finally { chain.getSwitchVerifierLock().writeLock().unlock(); } } diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/CrossTxHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/CrossTxHandler.java similarity index 86% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/CrossTxHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/CrossTxHandler.java index d15b4aebb4..b81da10337 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/CrossTxHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/CrossTxHandler.java @@ -1,9 +1,9 @@ -package io.nuls.crosschain.nuls.utils.thread; +package io.nuls.crosschain.utils.thread; import io.nuls.base.data.Transaction; import io.nuls.core.constant.TxType; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.utils.TxUtil; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.utils.TxUtil; public class CrossTxHandler implements Runnable { private Chain chain; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/ResetOtherChainVerifierListHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/ResetOtherChainVerifierListHandler.java similarity index 80% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/ResetOtherChainVerifierListHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/ResetOtherChainVerifierListHandler.java index f5fbf77974..0386ac72c3 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/ResetOtherChainVerifierListHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/ResetOtherChainVerifierListHandler.java @@ -1,9 +1,8 @@ -package io.nuls.crosschain.nuls.utils.thread; +package io.nuls.crosschain.utils.thread; import io.nuls.base.data.Transaction; -import io.nuls.core.constant.TxType; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.utils.TxUtil; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.utils.TxUtil; /** * 重置平行链上存储的主链验证人列表 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/VerifierChangeTxHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/VerifierChangeTxHandler.java similarity index 96% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/VerifierChangeTxHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/VerifierChangeTxHandler.java index f0c3361dc5..bc47946fa2 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/VerifierChangeTxHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/VerifierChangeTxHandler.java @@ -1,12 +1,10 @@ -package io.nuls.crosschain.nuls.utils.thread; +package io.nuls.crosschain.utils.thread; import io.nuls.base.data.Transaction; -import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.exception.NulsException; import io.nuls.crosschain.base.model.bo.txdata.VerifierChangeData; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.utils.TxUtil; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.utils.TxUtil; import java.io.IOException; import java.util.*; diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/GetCtxStateHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/GetCtxStateHandler.java similarity index 74% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/GetCtxStateHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/GetCtxStateHandler.java index 180c533727..2b83b5aeb2 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/GetCtxStateHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/GetCtxStateHandler.java @@ -1,7 +1,7 @@ -package io.nuls.crosschain.nuls.utils.thread.handler; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.message.UntreatedMessage; -import io.nuls.crosschain.nuls.utils.TxUtil; +package io.nuls.crosschain.utils.thread.handler; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.message.UntreatedMessage; +import io.nuls.crosschain.utils.TxUtil; /** * 跨链查询跨链交易处理状态 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/HashMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/HashMessageHandler.java similarity index 81% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/HashMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/HashMessageHandler.java index bdbb42382a..a50424aedb 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/HashMessageHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/HashMessageHandler.java @@ -1,7 +1,7 @@ -package io.nuls.crosschain.nuls.utils.thread.handler; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.message.UntreatedMessage; -import io.nuls.crosschain.nuls.utils.MessageUtil; +package io.nuls.crosschain.utils.thread.handler; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.message.UntreatedMessage; +import io.nuls.crosschain.utils.MessageUtil; /** * 其他链节点广播的跨链交易Hash消息处理线程 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/OtherCtxMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/OtherCtxMessageHandler.java similarity index 89% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/OtherCtxMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/OtherCtxMessageHandler.java index e019949717..9ca0aa5cf5 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/OtherCtxMessageHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/OtherCtxMessageHandler.java @@ -1,14 +1,14 @@ -package io.nuls.crosschain.nuls.utils.thread.handler; +package io.nuls.crosschain.utils.thread.handler; import io.nuls.base.data.NulsHash; import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.message.GetOtherCtxMessage; import io.nuls.crosschain.base.message.NewOtherCtxMessage; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.NodeType; -import io.nuls.crosschain.nuls.model.bo.message.UntreatedMessage; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.utils.MessageUtil; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.NodeType; +import io.nuls.crosschain.model.bo.message.UntreatedMessage; +import io.nuls.crosschain.rpc.call.NetWorkCall; +import io.nuls.crosschain.utils.MessageUtil; /** diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/SignMessageByzantineHandler.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/SignMessageByzantineHandler.java similarity index 84% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/SignMessageByzantineHandler.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/SignMessageByzantineHandler.java index d3f36a3907..0a44c419f6 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/thread/handler/SignMessageByzantineHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/SignMessageByzantineHandler.java @@ -1,9 +1,9 @@ -package io.nuls.crosschain.nuls.utils.thread.handler; +package io.nuls.crosschain.utils.thread.handler; import io.nuls.crosschain.base.message.BroadCtxSignMessage; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.model.bo.message.UntreatedMessage; -import io.nuls.crosschain.nuls.utils.MessageUtil; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.model.bo.message.UntreatedMessage; +import io.nuls.crosschain.utils.MessageUtil; /** * 链内节点广播过来的跨链交易签名拜占庭验证处理线程 diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/validator/CrossTxValidator.java similarity index 88% rename from module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java rename to module/nuls-cores/src/main/java/io/nuls/crosschain/utils/validator/CrossTxValidator.java index 51c72674a5..0c24f71e45 100644 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/utils/validator/CrossTxValidator.java +++ b/module/nuls-cores/src/main/java/io/nuls/crosschain/utils/validator/CrossTxValidator.java @@ -1,4 +1,4 @@ -package io.nuls.crosschain.nuls.utils.validator; +package io.nuls.crosschain.utils.validator; import io.nuls.base.basic.AddressTool; import io.nuls.base.basic.TransactionFeeCalculator; @@ -6,40 +6,31 @@ import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.SignatureUtil; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.TxType; -import io.nuls.core.crypto.ECKey; -import io.nuls.core.model.ArraysTool; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.model.StringUtils; -import io.nuls.core.parse.SerializeUtils; -import io.nuls.crosschain.base.constant.CommandConstant; -import io.nuls.crosschain.base.message.BroadCtxSignMessage; -import io.nuls.crosschain.base.model.bo.ChainInfo; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.AccountCall; -import io.nuls.crosschain.nuls.rpc.call.ChainManagerCall; -import io.nuls.crosschain.nuls.rpc.call.ConsensusCall; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.srorage.ConvertHashService; -import io.nuls.crosschain.nuls.srorage.ConvertCtxService; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.CommonUtil; -import io.nuls.crosschain.nuls.utils.TxUtil; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; +import io.nuls.core.crypto.ECKey; import io.nuls.core.exception.NulsException; import io.nuls.core.model.BigIntegerUtils; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; +import io.nuls.core.model.ByteUtils; +import io.nuls.core.parse.SerializeUtils; +import io.nuls.crosschain.base.model.bo.ChainInfo; +import io.nuls.crosschain.constant.NulsCrossChainErrorCode; +import io.nuls.crosschain.model.bo.Chain; +import io.nuls.crosschain.rpc.call.ChainManagerCall; +import io.nuls.crosschain.srorage.ConvertCtxService; +import io.nuls.crosschain.srorage.ConvertHashService; +import io.nuls.crosschain.srorage.RegisteredCrossChainService; +import io.nuls.crosschain.utils.CommonUtil; +import io.nuls.crosschain.utils.TxUtil; +import io.nuls.crosschain.utils.manager.ChainManager; import java.io.IOException; import java.math.BigInteger; -import java.util.*; - -import static io.nuls.crosschain.nuls.constant.NulsCrossChainErrorCode.PAYEE_AND_PAYER_IS_THE_SAME_CHAIN; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; /** * 跨链交易验证工具类 @@ -51,7 +42,7 @@ @Component public class CrossTxValidator { @Autowired - private NulsCrossChainConfig config; + private NulsCoresConfig config; @Autowired private ConvertHashService convertHashService; @@ -221,7 +212,7 @@ public boolean coinDataValid(Chain chain, CoinData coinData, int txSize, boolean //from和to不能是同一个地址 if (fromChainId == toChainId) { chain.getLogger().error("跨链交易转出方和转入方是同一条链账户"); - throw new NulsException(PAYEE_AND_PAYER_IS_THE_SAME_CHAIN); + throw new NulsException(NulsCrossChainErrorCode.PAYEE_AND_PAYER_IS_THE_SAME_CHAIN); } //查询这条跨链交易是否与本链相关 int chainId = chain.getChainId(); diff --git a/module/nuls-cores/src/main/java/io/nuls/ledger/LedgerBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/ledger/LedgerBootstrap.java new file mode 100644 index 0000000000..80d3121e47 --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/LedgerBootstrap.java @@ -0,0 +1,94 @@ +/*- + * ⁣⁣ + * MIT License + * ⁣⁣ + * Copyright (C) 2017 - 2018 nuls.io + * ⁣⁣ + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * ⁣⁣ + */ +package io.nuls.ledger; + +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.core.ioc.SpringLiteContext; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.modulebootstrap.Module; +import io.nuls.core.rpc.util.AddressPrefixDatas; +import io.nuls.ledger.constant.LedgerConstant; +import io.nuls.ledger.manager.LedgerChainManager; +import io.nuls.ledger.utils.LoggerUtil; + +/** + * @author: Niels Wang + * @date: 2018/10/15 + */ +@Component +public class LedgerBootstrap implements INulsCoresBootstrap { + @Autowired + NulsCoresConfig ledgerConfig; + @Autowired + AddressPrefixDatas addressPrefixDatas; + + @Override + public int order() { + return 5; + } + + @Override + public void mainFunction(String[] args) { + this.init(); + } + + @Override + public Module moduleInfo() { + return new Module(ModuleE.LG.abbr, "1.0"); + } + + public void init() { + try { + LedgerConstant.UNCONFIRM_NONCE_EXPIRED_TIME = ledgerConfig.getUnconfirmedTxExpired(); + LedgerConstant.DEFAULT_ENCODING = ledgerConfig.getEncoding(); + LedgerConstant.blackHolePublicKey = HexUtil.decode(ledgerConfig.getBlackHolePublicKey()); + LedgerChainManager ledgerChainManager = SpringLiteContext.getBean(LedgerChainManager.class); + ledgerChainManager.initChains(); + LoggerUtil.COMMON_LOG.info("Ledger data init complete!"); + } catch (Exception e) { + LoggerUtil.COMMON_LOG.error(e); + LoggerUtil.COMMON_LOG.error("start fail..."); + System.exit(-1); + } + + } + + @Override + public void onDependenciesReady() { + try { + LedgerChainManager ledgerChainManager = SpringLiteContext.getBean(LedgerChainManager.class); + ledgerChainManager.syncBlockHeight(); + } catch (Exception e) { + LoggerUtil.COMMON_LOG.error(e); + System.exit(-1); + } + } + +} diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/constant/CmdConstant.java b/module/nuls-cores/src/main/java/io/nuls/ledger/constant/CmdConstant.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/constant/CmdConstant.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/constant/CmdConstant.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/constant/LedgerConstant.java b/module/nuls-cores/src/main/java/io/nuls/ledger/constant/LedgerConstant.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/constant/LedgerConstant.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/constant/LedgerConstant.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/constant/LedgerErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/ledger/constant/LedgerErrorCode.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/constant/LedgerErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/constant/LedgerErrorCode.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java b/module/nuls-cores/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java similarity index 96% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java index 5af50d8c88..773065dfa1 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/manager/LedgerChainManager.java @@ -24,13 +24,12 @@ */ package io.nuls.ledger.manager; -import io.nuls.base.protocol.ProtocolLoader; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.rpc.model.ModuleE; -import io.nuls.ledger.config.LedgerConfig; import io.nuls.ledger.constant.LedgerConstant; import io.nuls.ledger.model.LedgerChain; import io.nuls.ledger.service.AssetRegMngService; @@ -59,7 +58,7 @@ public class LedgerChainManager { @Autowired AssetRegMngService assetRegMngService; @Autowired - LedgerConfig ledgerConfig; + NulsCoresConfig ledgerConfig; private Map chainMap = new ConcurrentHashMap<>(); Map localChainDefaultAsset = new HashMap<>(16); @@ -76,7 +75,6 @@ public void addChain(int chainId) throws Exception { LedgerChain ledgerChain = new LedgerChain(chainId); //建立日志 LoggerUtil.createLogger(chainId); - ProtocolLoader.load(chainId, false); //建立数据库 SpringLiteContext.getBean(RepositoryImpl.class).initChainDb(chainId); SpringLiteContext.getBean(LgBlockSyncRepositoryImpl.class).initChainDb(chainId); diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/AccountBalance.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/AccountBalance.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/AccountBalance.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/AccountBalance.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/ChainHeight.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/ChainHeight.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/ChainHeight.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/ChainHeight.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/FreezeLockState.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/FreezeLockState.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/FreezeLockState.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/FreezeLockState.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/LedgerChain.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/LedgerChain.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/LedgerChain.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/LedgerChain.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/TempAccountNonce.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/TempAccountNonce.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/TempAccountNonce.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/TempAccountNonce.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/TempMaxAssetId.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/TempMaxAssetId.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/TempMaxAssetId.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/TempMaxAssetId.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/Uncfd2CfdKey.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/Uncfd2CfdKey.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/Uncfd2CfdKey.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/Uncfd2CfdKey.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/ValidateResult.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/ValidateResult.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/ValidateResult.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/ValidateResult.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/AccountState.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/AccountState.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/AccountState.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/AccountState.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/AccountStateUnconfirmed.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/AccountStateUnconfirmed.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/AccountStateUnconfirmed.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/AccountStateUnconfirmed.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/BlockSnapshotAccounts.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/BlockSnapshotAccounts.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/BlockSnapshotAccounts.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/BlockSnapshotAccounts.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/BlockSnapshotTxs.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/BlockSnapshotTxs.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/BlockSnapshotTxs.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/BlockSnapshotTxs.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/LedgerAsset.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/LedgerAsset.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/LedgerAsset.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/LedgerAsset.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/TxUnconfirmed.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/TxUnconfirmed.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/TxUnconfirmed.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/TxUnconfirmed.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/AccountStateSnapshot.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/AccountStateSnapshot.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/AccountStateSnapshot.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/AccountStateSnapshot.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/AmountNonce.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/AmountNonce.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/AmountNonce.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/AmountNonce.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/FreezeHeightState.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/FreezeHeightState.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/FreezeHeightState.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/FreezeHeightState.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/FreezeLockTimeState.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/FreezeLockTimeState.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/po/sub/FreezeLockTimeState.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/po/sub/FreezeLockTimeState.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/tx/AssetRegTransaction.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/tx/AssetRegTransaction.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/tx/AssetRegTransaction.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/tx/AssetRegTransaction.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/model/tx/txdata/TxLedgerAsset.java b/module/nuls-cores/src/main/java/io/nuls/ledger/model/tx/txdata/TxLedgerAsset.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/model/tx/txdata/TxLedgerAsset.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/model/tx/txdata/TxLedgerAsset.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/call/CallRpcService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/call/CallRpcService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/call/CallRpcService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/call/CallRpcService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java index 31a6386297..f42ce6b821 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/call/impl/CallRpcServiceImpl.java @@ -29,6 +29,7 @@ import io.nuls.base.data.Transaction; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.ErrorCode; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -39,7 +40,6 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.core.rpc.util.RpcCall; -import io.nuls.ledger.config.LedgerConfig; import io.nuls.ledger.constant.CmdConstant; import io.nuls.ledger.constant.LedgerErrorCode; import io.nuls.ledger.rpc.call.CallRpcService; @@ -55,7 +55,7 @@ @Component public class CallRpcServiceImpl implements CallRpcService { @Autowired - LedgerConfig ledgerConfig; + NulsCoresConfig ledgerConfig; @Override public long getBlockLatestHeight(int chainId) { diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java index 2c39a5892e..b12393eb02 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AccountStateCmd.java @@ -56,6 +56,7 @@ * @author lanjinsheng . */ @Component +@NulsCoresCmd(module = ModuleE.LG) public class AccountStateCmd extends BaseLedgerCmd { diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java similarity index 98% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java index 21a4cc6c7d..c6d459ee81 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegCmd.java @@ -25,11 +25,11 @@ */ package io.nuls.ledger.rpc.cmd; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.ledger.config.LedgerConfig; import io.nuls.ledger.constant.CmdConstant; import io.nuls.ledger.service.AssetRegMngService; import io.nuls.ledger.utils.LoggerUtil; @@ -46,9 +46,10 @@ * @date 2019/10/22 */ @Component +@NulsCoresCmd(module = ModuleE.LG) public class AssetsRegCmd extends BaseLedgerCmd { @Autowired - LedgerConfig ledgerConfig; + NulsCoresConfig ledgerConfig; @Autowired AssetRegMngService assetRegMngService; diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java index c227ae2a2e..f0f08f21a9 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegContractCmd.java @@ -26,12 +26,12 @@ package io.nuls.ledger.rpc.cmd; import io.nuls.base.basic.AddressTool; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.ledger.config.LedgerConfig; import io.nuls.ledger.constant.CmdConstant; import io.nuls.ledger.constant.LedgerConstant; import io.nuls.ledger.model.po.LedgerAsset; @@ -51,9 +51,10 @@ * @date 2019/10/22 */ @Component +@NulsCoresCmd(module = ModuleE.LG) public class AssetsRegContractCmd extends BaseLedgerCmd { @Autowired - LedgerConfig ledgerConfig; + NulsCoresConfig ledgerConfig; @Autowired CallRpcService rpcService; @Autowired diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java similarity index 98% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java index 1c5db20769..4d6a921134 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/AssetsRegTxCmd.java @@ -32,6 +32,7 @@ import io.nuls.base.data.CoinTo; import io.nuls.base.data.Transaction; import io.nuls.base.signture.P2PHKSignature; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.ErrorCode; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -40,7 +41,6 @@ import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.ledger.config.LedgerConfig; import io.nuls.ledger.constant.CmdConstant; import io.nuls.ledger.constant.LedgerErrorCode; import io.nuls.ledger.model.po.AccountState; @@ -63,9 +63,10 @@ * @date 2019/10/22 */ @Component +@NulsCoresCmd(module = ModuleE.LG) public class AssetsRegTxCmd extends BaseLedgerCmd { @Autowired - LedgerConfig ledgerConfig; + NulsCoresConfig ledgerConfig; @Autowired CallRpcService rpcService; @Autowired diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java index 41f7b561b4..cf7cf32e43 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/ChainAssetCmd.java @@ -54,6 +54,7 @@ * @date 2019/02/14 **/ @Component +@NulsCoresCmd(module = ModuleE.LG) public class ChainAssetCmd extends BaseLedgerCmd { @Autowired ChainAssetsService chainAssetsService; diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/TransactionCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/LgmTransactionCmd.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/TransactionCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/LgmTransactionCmd.java index d00ee9fc5a..0bdb6fd801 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/TransactionCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/LgmTransactionCmd.java @@ -49,7 +49,8 @@ * @date 2018/11/20 */ @Component -public class TransactionCmd extends BaseLedgerCmd { +@NulsCoresCmd(module = ModuleE.LG) +public class LgmTransactionCmd extends BaseLedgerCmd { @Autowired private TransactionService transactionService; diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java index b57e0e5775..9643b1b0b2 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/rpc/cmd/ValidatorCmd.java @@ -52,6 +52,7 @@ * @author lanjinsheng */ @Component +@NulsCoresCmd(module = ModuleE.LG) public class ValidatorCmd extends BaseLedgerCmd { @Autowired CoinDataValidator coinDataValidator; diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/AccountStateService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/AccountStateService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/AccountStateService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/AccountStateService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/AssetRegMngService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/AssetRegMngService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/AssetRegMngService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/AssetRegMngService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/BlockDataService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/BlockDataService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/BlockDataService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/BlockDataService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/ChainAssetsService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/ChainAssetsService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/ChainAssetsService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/ChainAssetsService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/FreezeStateService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/FreezeStateService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/FreezeStateService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/FreezeStateService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/TransactionService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/TransactionService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/TransactionService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/TransactionService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/UnconfirmedStateService.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/UnconfirmedStateService.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/UnconfirmedStateService.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/UnconfirmedStateService.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AccountStateServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/AccountStateServiceImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AccountStateServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/AccountStateServiceImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java similarity index 99% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java index 389d1a12e0..f1f8369115 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/AssetRegMngServiceImpl.java @@ -26,6 +26,7 @@ package io.nuls.ledger.service.impl; import io.nuls.base.basic.AddressTool; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.constant.ErrorCode; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; @@ -33,7 +34,6 @@ import io.nuls.core.model.BigIntegerUtils; import io.nuls.core.model.ByteUtils; import io.nuls.core.model.FormatValidUtils; -import io.nuls.ledger.config.LedgerConfig; import io.nuls.ledger.constant.LedgerConstant; import io.nuls.ledger.constant.LedgerErrorCode; import io.nuls.ledger.model.po.AccountState; @@ -60,7 +60,7 @@ @Component public class AssetRegMngServiceImpl implements AssetRegMngService { @Autowired - LedgerConfig ledgerConfig; + NulsCoresConfig ledgerConfig; @Autowired ChainAssetsService chainAssetsService; /** diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/BlockDataServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/BlockDataServiceImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/BlockDataServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/BlockDataServiceImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/ChainAssetsServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/ChainAssetsServiceImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/ChainAssetsServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/ChainAssetsServiceImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/FreezeStateServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/FreezeStateServiceImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/FreezeStateServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/FreezeStateServiceImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/TransactionServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/TransactionServiceImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/TransactionServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/TransactionServiceImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/UnconfirmedStateServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/UnconfirmedStateServiceImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/impl/UnconfirmedStateServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/impl/UnconfirmedStateServiceImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/CommontTransactionProcessor.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/CommontTransactionProcessor.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/CommontTransactionProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/CommontTransactionProcessor.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/LockedTransactionProcessor.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/LockedTransactionProcessor.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/LockedTransactionProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/LockedTransactionProcessor.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/TxCommonProcessor.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/TxCommonProcessor.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/TxCommonProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/TxCommonProcessor.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/TxLockedProcessor.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/TxLockedProcessor.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/processor/TxLockedProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/processor/TxLockedProcessor.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/v15/AssetRegTransferProcessor.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/service/v5/AssetRegTransferProcessor.java b/module/nuls-cores/src/main/java/io/nuls/ledger/service/v5/AssetRegTransferProcessor.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/service/v5/AssetRegTransferProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/service/v5/AssetRegTransferProcessor.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/AccountIndexRepository.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/AccountIndexRepository.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/AccountIndexRepository.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/AccountIndexRepository.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/AssetRegMngRepository.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/AssetRegMngRepository.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/AssetRegMngRepository.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/AssetRegMngRepository.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/CrossChainAssetRegMngRepository.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/CrossChainAssetRegMngRepository.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/CrossChainAssetRegMngRepository.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/CrossChainAssetRegMngRepository.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/DataBaseArea.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/DataBaseArea.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/DataBaseArea.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/DataBaseArea.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/LgBlockSyncRepository.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/LgBlockSyncRepository.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/LgBlockSyncRepository.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/LgBlockSyncRepository.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/Repository.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/Repository.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/Repository.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/Repository.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/UnconfirmedRepository.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/UnconfirmedRepository.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/UnconfirmedRepository.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/UnconfirmedRepository.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java similarity index 91% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java index 5ad90ec2d1..475f30e5ce 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/AccountIndexRepositoryImpl.java @@ -25,14 +25,19 @@ */ package io.nuls.ledger.storage.impl; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.InitializingBean; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.model.ByteUtils; +import io.nuls.core.rockdb.manager.RocksDBManager; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; import io.nuls.ledger.storage.AccountIndexRepository; import io.nuls.ledger.storage.DataBaseArea; +import java.io.File; import java.util.List; import java.util.Map; @@ -45,6 +50,8 @@ @Component public class AccountIndexRepositoryImpl implements AccountIndexRepository, InitializingBean { + @Autowired + private NulsCoresConfig config; String getLedgerAssetIndexTableName(int chainId) { return DataBaseArea.TB_LEDGER_ASSET_INDEX+ "_" +chainId; @@ -59,6 +66,7 @@ String getLedgerAddressIndexTableName(int addressChainId,int assetChainId,int as public String initAssetsIndexDb(int addressChainId) { String table = getLedgerAssetIndexTableName(addressChainId); try { + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(table)) { RocksDBService.createTable(table); } @@ -71,6 +79,7 @@ public String initAssetsIndexDb(int addressChainId) { public String initLedgerAddressIndexDb(int addressChainId,int assetChainId,int assetId) { String table = getLedgerAddressIndexTableName(addressChainId,assetChainId,assetId); try { + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(table)) { RocksDBService.createTable(table); } diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java similarity index 94% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java index cb9c1e8e27..ae9b20b2fc 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/AssetRegMngRepositoryImpl.java @@ -25,16 +25,21 @@ */ package io.nuls.ledger.storage.impl; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.InitializingBean; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.model.ByteUtils; +import io.nuls.core.rockdb.manager.RocksDBManager; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; import io.nuls.ledger.constant.LedgerConstant; import io.nuls.ledger.model.po.LedgerAsset; import io.nuls.ledger.storage.AssetRegMngRepository; import io.nuls.ledger.storage.DataBaseArea; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,6 +51,9 @@ */ @Component public class AssetRegMngRepositoryImpl implements AssetRegMngRepository, InitializingBean { + + @Autowired + private NulsCoresConfig config; /** * 缓存合约资产id */ @@ -53,6 +61,7 @@ public class AssetRegMngRepositoryImpl implements AssetRegMngRepository, Initial String getLedgerAssetRegMngTableName(int chainId) throws Exception { String tableName = DataBaseArea.TB_LEDGER_ASSET_REG_MNG + LedgerConstant.DOWN_LINE + chainId; + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(tableName)) { RocksDBService.createTable(tableName); } @@ -61,6 +70,7 @@ String getLedgerAssetRegMngTableName(int chainId) throws Exception { String getLedgerAssetRegHashIndexTableName(int chainId) throws Exception { String tableName = DataBaseArea.TB_LEDGER_ASSET_REG_HASH_INDEX + "_" + chainId; + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(tableName)) { RocksDBService.createTable(tableName); } @@ -69,6 +79,7 @@ String getLedgerAssetRegHashIndexTableName(int chainId) throws Exception { String getLedgerAssetRegContractAddrIndexTableName(int chainId) throws Exception { String tableName = DataBaseArea.TB_LEDGER_ASSET_REG_CONTRACT_INDEX + "_" + chainId; + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(tableName)) { RocksDBService.createTable(tableName); } diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java similarity index 94% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java index 6a2624fdac..7bcf8374ea 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/CrossChainAssetRegMngRepositoryImpl.java @@ -25,15 +25,20 @@ */ package io.nuls.ledger.storage.impl; +import io.nuls.common.NulsCoresConfig; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.model.ByteUtils; +import io.nuls.core.rockdb.manager.RocksDBManager; import io.nuls.core.rockdb.service.BatchOperation; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; import io.nuls.ledger.constant.LedgerConstant; import io.nuls.ledger.model.po.LedgerAsset; import io.nuls.ledger.storage.CrossChainAssetRegMngRepository; import io.nuls.ledger.storage.DataBaseArea; +import java.io.File; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -47,10 +52,14 @@ @Component public class CrossChainAssetRegMngRepositoryImpl implements CrossChainAssetRegMngRepository { + @Autowired + private NulsCoresConfig config; + String tableNamePrefix = DataBaseArea.TB_LEDGER_CROSS_CHAIN_ASSET + LedgerConstant.DOWN_LINE; String getTableName(int chainId) throws Exception { String tableName = tableNamePrefix + chainId; + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(tableName)) { RocksDBService.createTable(tableName); } diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java similarity index 95% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java index 9ca9838204..0b1472a62c 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/LgBlockSyncRepositoryImpl.java @@ -25,17 +25,22 @@ */ package io.nuls.ledger.storage.impl; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.InitializingBean; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.model.ByteUtils; +import io.nuls.core.rockdb.manager.RocksDBManager; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; import io.nuls.ledger.constant.LedgerConstant; import io.nuls.ledger.model.po.BlockSnapshotTxs; import io.nuls.ledger.storage.DataBaseArea; import io.nuls.ledger.storage.LgBlockSyncRepository; import io.nuls.ledger.utils.LoggerUtil; +import java.io.File; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; @@ -49,6 +54,9 @@ @Component public class LgBlockSyncRepositoryImpl implements LgBlockSyncRepository, InitializingBean { + @Autowired + private NulsCoresConfig config; + public LgBlockSyncRepositoryImpl() { } @@ -160,6 +168,7 @@ String getLedgerHashTableName(int chainId) { */ public void initChainDb(int addressChainId) { try { + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(getLedgerNonceTableName(addressChainId))) { RocksDBService.createTable(getLedgerNonceTableName(addressChainId)); } @@ -188,6 +197,7 @@ public void initTableName() throws NulsException { @Override public void saveAccountNonces(int chainId, Map noncesMap) throws Exception { String table = getLedgerNonceTableName(chainId); + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(table)) { RocksDBService.createTable(table); } diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java similarity index 95% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java index 1a0ba83356..2b07db75c1 100644 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/RepositoryImpl.java @@ -26,19 +26,24 @@ package io.nuls.ledger.storage.impl; import io.nuls.base.basic.NulsByteBuffer; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.basic.InitializingBean; +import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; import io.nuls.core.model.ByteUtils; +import io.nuls.core.rockdb.manager.RocksDBManager; import io.nuls.core.rockdb.model.Entry; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; import io.nuls.ledger.model.ChainHeight; import io.nuls.ledger.model.po.AccountState; import io.nuls.ledger.model.po.BlockSnapshotAccounts; import io.nuls.ledger.storage.DataBaseArea; import io.nuls.ledger.storage.Repository; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -53,6 +58,9 @@ */ @Component public class RepositoryImpl implements Repository, InitializingBean { + + @Autowired + private NulsCoresConfig config; /** * key1=chainId, Map1=确认账户状态， key2= addr+assetkey value=AccountState */ @@ -215,6 +223,7 @@ public String getChainsHeightTableName() { */ public void initChainDb(int addressChainId) { try { + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(getLedgerAccountTableName(addressChainId))) { RocksDBService.createTable(getLedgerAccountTableName(addressChainId)); } @@ -234,6 +243,7 @@ public void afterPropertiesSet() throws NulsException { @Override public void initTableName() throws NulsException { try { + RocksDBManager.setDataPath(config.getDataPath() + File.separator + ModuleE.LG.name); if (!RocksDBService.existTable(getChainsHeightTableName())) { RocksDBService.createTable(getChainsHeightTableName()); } else { diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/UnconfirmedRepositoryImpl.java b/module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/UnconfirmedRepositoryImpl.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/storage/impl/UnconfirmedRepositoryImpl.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/storage/impl/UnconfirmedRepositoryImpl.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/utils/CoinDataUtil.java b/module/nuls-cores/src/main/java/io/nuls/ledger/utils/CoinDataUtil.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/utils/CoinDataUtil.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/utils/CoinDataUtil.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/utils/LedgerUtil.java b/module/nuls-cores/src/main/java/io/nuls/ledger/utils/LedgerUtil.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/utils/LedgerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/utils/LedgerUtil.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/utils/LockerUtil.java b/module/nuls-cores/src/main/java/io/nuls/ledger/utils/LockerUtil.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/utils/LockerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/utils/LockerUtil.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/ledger/utils/LoggerUtil.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/utils/LoggerUtil.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/utils/ResponseUtil.java b/module/nuls-cores/src/main/java/io/nuls/ledger/utils/ResponseUtil.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/utils/ResponseUtil.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/utils/ResponseUtil.java diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/validator/CoinDataValidator.java b/module/nuls-cores/src/main/java/io/nuls/ledger/validator/CoinDataValidator.java similarity index 100% rename from module/nuls-ledger/src/main/java/io/nuls/ledger/validator/CoinDataValidator.java rename to module/nuls-cores/src/main/java/io/nuls/ledger/validator/CoinDataValidator.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/NetworkBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/network/NetworkBootstrap.java similarity index 80% rename from module/nuls-network/src/main/java/io/nuls/network/NetworkBootstrap.java rename to module/nuls-cores/src/main/java/io/nuls/network/NetworkBootstrap.java index 50ecdd286f..60e1e2ad3c 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/NetworkBootstrap.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/NetworkBootstrap.java @@ -25,19 +25,16 @@ package io.nuls.network; +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; import io.nuls.core.model.StringUtils; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.ManagerStatusEnum; import io.nuls.network.constant.NetworkConstant; import io.nuls.network.manager.*; @@ -58,16 +55,19 @@ * @date 2018/11/01 */ @Component -public class NetworkBootstrap extends RpcModule { +public class NetworkBootstrap implements INulsCoresBootstrap { @Autowired - NetworkConfig networkConfig; + NulsCoresConfig networkConfig; private boolean hadRun = false; - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); + @Override + public int order() { + return 2; + } + + @Override + public void mainFunction(String[] args) { + this.init(); } private boolean validatCfg() { @@ -146,13 +146,8 @@ private void managerInit() throws Exception { } - /** - * 初始化模块信息，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 - */ - @Override public void init() { try { - super.init(); System.setProperty("io.netty.tryReflectionSetAccessible", "true"); if (!validatCfg()) { System.exit(-1); @@ -168,22 +163,11 @@ public void init() { } - @Override - public Module[] declareDependent() { - return new Module[]{new Module(ModuleE.BL.abbr, ROLE)}; - } - @Override public Module moduleInfo() { - return new Module(ModuleE.NW.abbr, ROLE); + return new Module(ModuleE.NW.abbr, "1.0"); } - /** - * doStart是让自身变为ready与onDependenciesReady没有先后顺序 - * - * @return - */ - @Override public boolean doStart() { Log.info("doStart begin========="); NodeGroupManager.getInstance().start(); @@ -197,9 +181,10 @@ public boolean doStart() { * @return */ @Override - public RpcModuleState onDependenciesReady() { + public void onDependenciesReady() { LoggerUtil.COMMON_LOG.info("network onDependenciesReady"); try { + doStart(); if (!hadRun) { ConnectionManager.getInstance().start(); TaskManager.getInstance().start(); @@ -215,24 +200,6 @@ public RpcModuleState onDependenciesReady() { System.exit(-1); } LoggerUtil.COMMON_LOG.info("network RUNNING......"); - return RpcModuleState.Running; - } - - @Override - public RpcModuleState onDependenciesLoss(Module dependenciesModule) { - LoggerUtil.COMMON_LOG.info("onDependenciesLoss module={}......", dependenciesModule.getName()); - try { - //关闭连接 - ConnectionManager.getInstance().change(ManagerStatusEnum.STOPED); - NodeGroupManager.getInstance().change(ManagerStatusEnum.STOPED); - } catch (Exception e) { - LoggerUtil.COMMON_LOG.error(e); - } - return RpcModuleState.Ready; } - @Override - protected long getTryRuningTimeout() { - return 180L; - } } diff --git a/module/nuls-network/src/main/java/io/nuls/network/constant/CmdConstant.java b/module/nuls-cores/src/main/java/io/nuls/network/constant/CmdConstant.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/constant/CmdConstant.java rename to module/nuls-cores/src/main/java/io/nuls/network/constant/CmdConstant.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/constant/ManagerStatusEnum.java b/module/nuls-cores/src/main/java/io/nuls/network/constant/ManagerStatusEnum.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/constant/ManagerStatusEnum.java rename to module/nuls-cores/src/main/java/io/nuls/network/constant/ManagerStatusEnum.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/constant/NetworkConstant.java b/module/nuls-cores/src/main/java/io/nuls/network/constant/NetworkConstant.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/constant/NetworkConstant.java rename to module/nuls-cores/src/main/java/io/nuls/network/constant/NetworkConstant.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/constant/NetworkErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/network/constant/NetworkErrorCode.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/constant/NetworkErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/network/constant/NetworkErrorCode.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/constant/NodeConnectStatusEnum.java b/module/nuls-cores/src/main/java/io/nuls/network/constant/NodeConnectStatusEnum.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/constant/NodeConnectStatusEnum.java rename to module/nuls-cores/src/main/java/io/nuls/network/constant/NodeConnectStatusEnum.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/constant/NodeStatusEnum.java b/module/nuls-cores/src/main/java/io/nuls/network/constant/NodeStatusEnum.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/constant/NodeStatusEnum.java rename to module/nuls-cores/src/main/java/io/nuls/network/constant/NodeStatusEnum.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/locker/Lockers.java b/module/nuls-cores/src/main/java/io/nuls/network/locker/Lockers.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/locker/Lockers.java rename to module/nuls-cores/src/main/java/io/nuls/network/locker/Lockers.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/BaseManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/BaseManager.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/BaseManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/BaseManager.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/ConnectionManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/ConnectionManager.java similarity index 98% rename from module/nuls-network/src/main/java/io/nuls/network/manager/ConnectionManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/ConnectionManager.java index c434b306fa..a9f6ee72cd 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/ConnectionManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/ConnectionManager.java @@ -28,12 +28,12 @@ import io.netty.channel.socket.SocketChannel; import io.netty.util.Attribute; import io.netty.util.AttributeKey; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; import io.nuls.core.rpc.netty.channel.manager.ConnectManager; import io.nuls.core.thread.ThreadUtils; import io.nuls.core.thread.commom.NulsThreadFactory; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.ManagerStatusEnum; import io.nuls.network.constant.NodeConnectStatusEnum; import io.nuls.network.constant.NodeStatusEnum; @@ -61,7 +61,7 @@ * @date 2018/11/01 */ public class ConnectionManager extends BaseManager { - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); NettyServer server = null; NettyServer serverCross = null; private static ConnectionManager instance = new ConnectionManager(); diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/MessageFactory.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/MessageFactory.java similarity index 98% rename from module/nuls-network/src/main/java/io/nuls/network/manager/MessageFactory.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/MessageFactory.java index 00e364b932..16f9640051 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/MessageFactory.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/MessageFactory.java @@ -24,9 +24,9 @@ */ package io.nuls.network.manager; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.NetworkConstant; import io.nuls.network.manager.handler.MessageHandlerFactory; import io.nuls.network.manager.handler.base.BaseMeesageHandlerInf; @@ -59,7 +59,7 @@ public class MessageFactory { private static MessageFactory instance = new MessageFactory(); private static final Map> MESSAGE_MAP = new HashMap<>(); - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); private NodeGroupManager nodeGroupManager = NodeGroupManager.getInstance(); private MessageFactory() { diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/MessageManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/MessageManager.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/MessageManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/MessageManager.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/NodeGroupManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/NodeGroupManager.java similarity index 96% rename from module/nuls-network/src/main/java/io/nuls/network/manager/NodeGroupManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/NodeGroupManager.java index 00fb3ef614..c57838b099 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/NodeGroupManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/NodeGroupManager.java @@ -24,8 +24,8 @@ */ package io.nuls.network.manager; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.ManagerStatusEnum; import io.nuls.network.model.Node; import io.nuls.network.model.NodeGroup; @@ -77,7 +77,7 @@ private NodeGroupManager() { * @return */ public List getAvailableShareNodes(Node node, int getChainId, boolean isCrossAddress) { - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); List addressList = new ArrayList<>(); List nodesList = new ArrayList(); @@ -156,7 +156,7 @@ public NodeGroup getNodeGroupByChainId(int chainId) { } public NodeGroup getMoonMainNet() { - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); if (networkConfig.isMoonNode()) { return getNodeGroupByChainId(networkConfig.getChainId()); } @@ -204,7 +204,7 @@ public boolean validMagicNumber(long magicNumber) { @Override public void init() { NodeGroupManager nodeGroupManager = NodeGroupManager.getInstance(); - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); /* * 获取配置的信息，进行自有网络的nodeGroup配置初始化 * Obtain the configuration information and initialize the nodeGroup configuration of the own netw diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/StorageManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/StorageManager.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/StorageManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/StorageManager.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/TaskManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/TaskManager.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/TaskManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/TaskManager.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/TimeManager.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/TimeManager.java similarity index 98% rename from module/nuls-network/src/main/java/io/nuls/network/manager/TimeManager.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/TimeManager.java index d2577ab7b7..5e45bee914 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/TimeManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/TimeManager.java @@ -25,11 +25,11 @@ package io.nuls.network.manager; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; import io.nuls.core.model.StringUtils; import io.nuls.core.thread.ThreadUtils; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.NetworkConstant; import io.nuls.network.model.Node; import io.nuls.network.model.NodeGroup; @@ -99,7 +99,7 @@ public static TimeManager getInstance() { private TimeManager() { if (0 == ntpSeverUrlList.size()) { - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); String timeServers = networkConfig.getTimeServers(); if (StringUtils.isNotBlank(timeServers)) { String[] urlArray = timeServers.split(NetworkConstant.COMMA); diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/MessageHandlerFactory.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/MessageHandlerFactory.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/MessageHandlerFactory.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/MessageHandlerFactory.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/base/BaseChannelHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/base/BaseChannelHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/base/BaseChannelHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/base/BaseChannelHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/base/BaseMeesageHandlerInf.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/base/BaseMeesageHandlerInf.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/base/BaseMeesageHandlerInf.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/base/BaseMeesageHandlerInf.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/base/BaseMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/base/BaseMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/base/BaseMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/base/BaseMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java similarity index 96% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java index 95e7868f16..3030a0bfb5 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/AddrMessageHandler.java @@ -179,7 +179,8 @@ private NetworkEventResult crossNetRecieveMessage(List ipAddress */ @Override public NetworkEventResult send(BaseMessage message, Node node, boolean asyn) { - LoggerUtil.logger(node.getNodeGroup().getChainId()).info("AddrMessageHandler Send:" + (node.isServer() ? "Server" : "Client") + ":" + node.getIp() + ":" + node.getRemotePort() + "==CMD=" + message.getHeader().getCommandStr()); + //TODO pierre test + LoggerUtil.logger(node.getNodeGroup().getChainId()).debug("AddrMessageHandler Send:" + (node.isServer() ? "Server" : "Client") + ":" + node.getIp() + ":" + node.getRemotePort() + "==CMD=" + message.getHeader().getCommandStr()); return super.send(message, node, asyn); } } diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java similarity index 93% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java index bbddf1352d..d57acf1ada 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/GetAddrMessageHandler.java @@ -86,7 +86,8 @@ public NetworkEventResult recieve(BaseMessage message, Node node) { @Override public NetworkEventResult send(BaseMessage message, Node node, boolean asyn) { - LoggerUtil.logger(node.getNodeGroup().getChainId()).info("GetAddrMessageHandler Send:" + (node.isServer() ? "Server" : "Client") + ":" + node.getIp() + ":" + node.getRemotePort() + "==CMD=" + message.getHeader().getCommandStr()); + //TODO pierre test + LoggerUtil.logger(node.getNodeGroup().getChainId()).debug("GetAddrMessageHandler Send:" + (node.isServer() ? "Server" : "Client") + ":" + node.getIp() + ":" + node.getRemotePort() + "==CMD=" + message.getHeader().getCommandStr()); return super.send(message, node, asyn); } diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/GetTimeMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/GetTimeMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/GetTimeMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/GetTimeMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/OtherModuleMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/OtherModuleMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/OtherModuleMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/OtherModuleMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/PeerInfoMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/PeerInfoMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/PeerInfoMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/PeerInfoMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/PingMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/PingMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/PingMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/PingMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/PongMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/PongMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/PongMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/PongMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/TimeMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/TimeMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/TimeMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/TimeMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/VerackMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/VerackMessageHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/VerackMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/VerackMessageHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java similarity index 96% rename from module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java index 6b4d3481df..2fc6c20c81 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/manager/handler/message/VersionMessageHandler.java @@ -215,7 +215,8 @@ private void clientRecieveHandler(BaseMessage message, Node node) { } //client:接收到server端消息，进行verack答复 VerackMessage verackMessage = MessageFactory.getInstance().buildVerackMessage(node, message.getHeader().getMagicNumber(), VerackMessageBody.VER_SUCCESS); - LoggerUtil.logger(node.getNodeGroup().getChainId()).info("rec node={} ver msg success.go response verackMessage..cross={}", node.getId(), node.isCrossConnect()); + //TODO pierre test + LoggerUtil.logger(node.getNodeGroup().getChainId()).debug("rec node={} ver msg success.go response verackMessage..cross={}", node.getId(), node.isCrossConnect()); MessageManager.getInstance().sendHandlerMsg(verackMessage, node, true); if (node.isSeedNode()) { //向种子节点请求地址 @@ -234,7 +235,8 @@ private void clientRecieveHandler(BaseMessage message, Node node) { @Override public NetworkEventResult recieve(BaseMessage message, Node node) { int chainId = NodeGroupManager.getInstance().getChainIdByMagicNum(message.getHeader().getMagicNumber()); - LoggerUtil.logger(chainId).info("VersionMessageHandler recieve:" + (node.isServer() ? "Server" : "Client") + ":" + node.getIp() + ":" + node.getRemotePort() + "==CMD=" + message.getHeader().getCommandStr()); + //TODO pierre test + LoggerUtil.logger(chainId).debug("VersionMessageHandler recieve:" + (node.isServer() ? "Server" : "Client") + ":" + node.getIp() + ":" + node.getRemotePort() + "==CMD=" + message.getHeader().getCommandStr()); if (Node.IN == node.getType()) { serverRecieveHandler(message, node); } else { diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/NetworkEventResult.java b/module/nuls-cores/src/main/java/io/nuls/network/model/NetworkEventResult.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/NetworkEventResult.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/NetworkEventResult.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/Node.java b/module/nuls-cores/src/main/java/io/nuls/network/model/Node.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/Node.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/Node.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/NodeGroup.java b/module/nuls-cores/src/main/java/io/nuls/network/model/NodeGroup.java similarity index 98% rename from module/nuls-network/src/main/java/io/nuls/network/model/NodeGroup.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/NodeGroup.java index c52f863563..f7eaf8e1f1 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/model/NodeGroup.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/model/NodeGroup.java @@ -25,9 +25,9 @@ */ package io.nuls.network.model; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.NetworkConstant; import io.nuls.network.constant.NodeConnectStatusEnum; import io.nuls.network.constant.NodeStatusEnum; @@ -38,8 +38,6 @@ import io.nuls.network.netty.container.NodesContainer; import io.nuls.network.utils.LoggerUtil; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.concurrent.BlockingDeque; import java.util.concurrent.ConcurrentHashMap; @@ -54,7 +52,7 @@ * @date 2018/11/01 */ public class NodeGroup implements Dto { - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); /** * 缓存网络组种无法及时处理的信息 */ diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/BestBlockInfo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/BestBlockInfo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/BestBlockInfo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/BestBlockInfo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/Dto.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/Dto.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/Dto.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/Dto.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/IpAddress.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/IpAddress.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/IpAddress.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/IpAddress.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/IpAddressShare.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/IpAddressShare.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/IpAddressShare.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/IpAddressShare.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/NetTimeUrl.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/NetTimeUrl.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/NetTimeUrl.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/NetTimeUrl.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/PeerCacheMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/PeerCacheMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/PeerCacheMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/PeerCacheMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/ProtocolRoleHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/ProtocolRoleHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/ProtocolRoleHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/ProtocolRoleHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/dto/RpcCacheMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/dto/RpcCacheMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/dto/RpcCacheMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/dto/RpcCacheMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/AddrMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/AddrMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/AddrMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/AddrMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/ByeMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/ByeMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/ByeMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/ByeMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/GetAddrMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/GetAddrMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/GetAddrMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/GetAddrMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/GetTimeMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/GetTimeMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/GetTimeMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/GetTimeMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/PeerInfoMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/PeerInfoMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/PeerInfoMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/PeerInfoMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/PingMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/PingMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/PingMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/PingMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/PongMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/PongMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/PongMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/PongMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/TimeMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/TimeMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/TimeMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/TimeMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/VerackMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/VerackMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/VerackMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/VerackMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/VersionMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/VersionMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/VersionMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/VersionMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/base/BaseMessage.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/base/BaseMessage.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/base/BaseMessage.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/base/BaseMessage.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/base/MessageHeader.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/base/MessageHeader.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/base/MessageHeader.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/base/MessageHeader.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/AddrMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/AddrMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/AddrMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/AddrMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/GetAddrMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/GetAddrMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/GetAddrMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/GetAddrMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/GetTimeMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/GetTimeMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/GetTimeMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/GetTimeMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/MessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/MessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/MessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/MessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/PeerInfoMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/PeerInfoMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/PeerInfoMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/PeerInfoMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/PingPongMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/PingPongMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/PingPongMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/PingPongMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/TimeMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/TimeMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/TimeMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/TimeMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/VerackMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/VerackMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/VerackMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/VerackMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/message/body/VersionMessageBody.java b/module/nuls-cores/src/main/java/io/nuls/network/model/message/body/VersionMessageBody.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/message/body/VersionMessageBody.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/message/body/VersionMessageBody.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/po/BasePo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/po/BasePo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/po/BasePo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/po/BasePo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/po/GroupNodesPo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/po/GroupNodesPo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/po/GroupNodesPo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/po/GroupNodesPo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/po/GroupPo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/po/GroupPo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/po/GroupPo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/po/GroupPo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/po/NodePo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/po/NodePo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/po/NodePo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/po/NodePo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/po/NodesContainerPo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/po/NodesContainerPo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/po/NodesContainerPo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/po/NodesContainerPo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/vo/Ivo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/vo/Ivo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/vo/Ivo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/vo/Ivo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/vo/NodeGroupVo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/vo/NodeGroupVo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/vo/NodeGroupVo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/vo/NodeGroupVo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/model/vo/NodeVo.java b/module/nuls-cores/src/main/java/io/nuls/network/model/vo/NodeVo.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/model/vo/NodeVo.java rename to module/nuls-cores/src/main/java/io/nuls/network/model/vo/NodeVo.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/NettyClient.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/NettyClient.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/NettyClient.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/NettyClient.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/NettyServer.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/NettyServer.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/NettyServer.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/NettyServer.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/NulsChannelInitializer.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/NulsChannelInitializer.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/NulsChannelInitializer.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/NulsChannelInitializer.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/codec/NulsLengthFieldBasedFrameDecoder.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/codec/NulsLengthFieldBasedFrameDecoder.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/codec/NulsLengthFieldBasedFrameDecoder.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/codec/NulsLengthFieldBasedFrameDecoder.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/codec/NulsMessageDecoder.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/codec/NulsMessageDecoder.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/codec/NulsMessageDecoder.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/codec/NulsMessageDecoder.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/codec/NulsMessageEncoder.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/codec/NulsMessageEncoder.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/codec/NulsMessageEncoder.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/codec/NulsMessageEncoder.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/container/NodesContainer.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/container/NodesContainer.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/container/NodesContainer.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/container/NodesContainer.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java similarity index 94% rename from module/nuls-network/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java index 2f0511c137..cc1d7be324 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/netty/handler/ClientChannelHandler.java @@ -76,7 +76,8 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception { } ctx.channel().config().setWriteBufferHighWaterMark(NetworkConstant.HIGH_WATER_MARK); ctx.channel().config().setWriteBufferLowWaterMark(NetworkConstant.LOW_WATER_MARK); - LoggerUtil.COMMON_LOG.info("Client Node is active:{}", node != null ? node.getId() : null); + //TODO pierre test + LoggerUtil.COMMON_LOG.debug("Client Node is active:{}", node != null ? node.getId() : null); } @Override @@ -118,7 +119,8 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception { Attribute nodeAttribute = ctx.channel().attr(key); Node node = nodeAttribute.get(); if (node != null && node.getDisconnectListener() != null) { - LoggerUtil.COMMON_LOG.info("-----------------client channelInactive node is channelUnregistered node={}-----------------", node.getId()); + //TODO pierre test + LoggerUtil.COMMON_LOG.debug("-----------------client channelInactive node is channelUnregistered node={}-----------------", node.getId()); node.getDisconnectListener().action(); } } diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/handler/HeartbeatServerHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/handler/HeartbeatServerHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/handler/HeartbeatServerHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/handler/HeartbeatServerHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/handler/ServerChannelHandler.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/handler/ServerChannelHandler.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/handler/ServerChannelHandler.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/handler/ServerChannelHandler.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/netty/listener/EventListener.java b/module/nuls-cores/src/main/java/io/nuls/network/netty/listener/EventListener.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/netty/listener/EventListener.java rename to module/nuls-cores/src/main/java/io/nuls/network/netty/listener/EventListener.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/call/BlockRpcService.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/call/BlockRpcService.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/call/BlockRpcService.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/call/BlockRpcService.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/call/impl/BlockRpcServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/call/impl/BlockRpcServiceImpl.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/call/impl/BlockRpcServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/call/impl/BlockRpcServiceImpl.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java similarity index 99% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java index e3c907e54f..6ce81a48a8 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/MessageRpc.java @@ -51,6 +51,7 @@ * @date 2018/11/12 **/ @Component +@NulsCoresCmd(module = ModuleE.NW) public class MessageRpc extends BaseCmd { private MessageHandlerFactory messageHandlerFactory = MessageHandlerFactory.getInstance(); diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java similarity index 99% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java index 86a239d00c..135cbd3742 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NetworkInfoRpc.java @@ -24,6 +24,7 @@ * @Description: 网络信息查询接口 */ @Component +@NulsCoresCmd(module = ModuleE.NW) public class NetworkInfoRpc extends BaseCmd { @CmdAnnotation(cmd = CmdConstant.CMD_NW_INFO, version = 1.0, diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java similarity index 99% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java index b7c0807762..2154ea6eda 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NodeGroupRpc.java @@ -24,6 +24,7 @@ */ package io.nuls.network.rpc.cmd; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.Log; @@ -31,7 +32,6 @@ import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.CmdConstant; import io.nuls.network.constant.NetworkConstant; import io.nuls.network.constant.NetworkErrorCode; @@ -52,9 +52,10 @@ * @date 2018/11/07 **/ @Component +@NulsCoresCmd(module = ModuleE.NW) public class NodeGroupRpc extends BaseCmd { @Autowired - NetworkConfig networkConfig; + NulsCoresConfig networkConfig; /** * nw_createNodeGroup diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java similarity index 99% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java index b059e1c888..a2e2bae337 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/NodeRpc.java @@ -24,13 +24,13 @@ */ package io.nuls.network.rpc.cmd; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.model.StringUtils; import io.nuls.core.rpc.cmd.BaseCmd; import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.CmdConstant; import io.nuls.network.constant.NetworkErrorCode; import io.nuls.network.constant.NodeConnectStatusEnum; @@ -54,13 +54,14 @@ * @create 2018/11/09 **/ @Component +@NulsCoresCmd(module = ModuleE.NW) public class NodeRpc extends BaseCmd { private NodeGroupManager nodeGroupManager = NodeGroupManager.getInstance(); private static final int STATE_ALL = 0; private static final int STATE_CONNECT = 1; private static final int STATE_DIS_CONNECT = 2; @Autowired - NetworkConfig networkConfig; + NulsCoresConfig networkConfig; /** * nw_addNodes diff --git a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java similarity index 92% rename from module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java rename to module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java index ce32e9828b..89827edab4 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/rpc/cmd/TimeServiceRpc.java @@ -26,10 +26,7 @@ import io.nuls.core.core.annotation.Component; import io.nuls.core.rpc.cmd.BaseCmd; -import io.nuls.core.rpc.model.CmdAnnotation; -import io.nuls.core.rpc.model.Key; -import io.nuls.core.rpc.model.ResponseData; -import io.nuls.core.rpc.model.TypeDescriptor; +import io.nuls.core.rpc.model.*; import io.nuls.core.rpc.model.message.Response; import io.nuls.network.constant.CmdConstant; import io.nuls.network.manager.TimeManager; @@ -43,6 +40,7 @@ * @date 2018/12/05 **/ @Component +@NulsCoresCmd(module = ModuleE.NW) public class TimeServiceRpc extends BaseCmd { @CmdAnnotation(cmd = CmdConstant.CMD_NW_CURRENT_TIME, version = 1.0, description = "获取节点网络时间") diff --git a/module/nuls-network/src/main/java/io/nuls/network/storage/DbService.java b/module/nuls-cores/src/main/java/io/nuls/network/storage/DbService.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/storage/DbService.java rename to module/nuls-cores/src/main/java/io/nuls/network/storage/DbService.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/storage/InitDB.java b/module/nuls-cores/src/main/java/io/nuls/network/storage/InitDB.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/storage/InitDB.java rename to module/nuls-cores/src/main/java/io/nuls/network/storage/InitDB.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/storage/impl/DbServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/network/storage/impl/DbServiceImpl.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/storage/impl/DbServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/network/storage/impl/DbServiceImpl.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/GroupStatusMonitor.java b/module/nuls-cores/src/main/java/io/nuls/network/task/GroupStatusMonitor.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/GroupStatusMonitor.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/GroupStatusMonitor.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/HeartBeatTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/HeartBeatTask.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/HeartBeatTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/HeartBeatTask.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/LocalInfosSendTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/LocalInfosSendTask.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/LocalInfosSendTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/LocalInfosSendTask.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/NodeDiscoverTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/NodeDiscoverTask.java similarity index 99% rename from module/nuls-network/src/main/java/io/nuls/network/task/NodeDiscoverTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/NodeDiscoverTask.java index 4bd0d4ee09..5668e72bd9 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/task/NodeDiscoverTask.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/task/NodeDiscoverTask.java @@ -233,7 +233,8 @@ public Node call() { } discoverList.forEach(n -> { try { - LoggerUtil.logger(n.get().getNodeGroup().getChainId()).info("discover node={},status={}", n.get().getId(), n.get().getStatus()); + //TODO pierre test + LoggerUtil.logger(n.get().getNodeGroup().getChainId()).debug("discover node={},status={}", n.get().getId(), n.get().getStatus()); } catch (InterruptedException e) { LoggerUtil.COMMON_LOG.error(e); } catch (ExecutionException e) { diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java similarity index 95% rename from module/nuls-network/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java index 1641d492e0..fb52e90bae 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/task/NodeMaintenanceTask.java @@ -24,8 +24,8 @@ */ package io.nuls.network.task; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.NodeConnectStatusEnum; import io.nuls.network.manager.ConnectionManager; import io.nuls.network.manager.NodeGroupManager; @@ -53,7 +53,7 @@ */ public class NodeMaintenanceTask implements Runnable { - private final NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + private final NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); private final ConnectionManager connectionManager = ConnectionManager.getInstance(); @Override @@ -121,7 +121,8 @@ public Node call() { } connectNodeList.forEach(n -> { try { - LoggerUtil.logger(nodeGroup.getChainId()).info("maintenance:chainId={},isCross={},node={}", nodeGroup.getChainId(), isCross, n.get().getId()); + //TODO pierre test + LoggerUtil.logger(nodeGroup.getChainId()).debug("maintenance:chainId={},isCross={},node={}", nodeGroup.getChainId(), isCross, n.get().getId()); } catch (InterruptedException e) { LoggerUtil.COMMON_LOG.error(e); } catch (ExecutionException e) { diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/NwInfosPrintTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/NwInfosPrintTask.java similarity index 92% rename from module/nuls-network/src/main/java/io/nuls/network/task/NwInfosPrintTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/NwInfosPrintTask.java index f6952b7d17..4300e44ebc 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/task/NwInfosPrintTask.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/task/NwInfosPrintTask.java @@ -24,8 +24,8 @@ */ package io.nuls.network.task; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.manager.NodeGroupManager; import io.nuls.network.manager.TimeManager; import io.nuls.network.model.Node; @@ -52,7 +52,7 @@ public void run() { private void printlnPeer() { NodeGroupManager nodeGroupManager = NodeGroupManager.getInstance(); List nodeGroupList = nodeGroupManager.getNodeGroups(); - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); if (networkConfig.isMoonNode()) { for (NodeGroup nodeGroup : nodeGroupList) { if (nodeGroup.isMoonCrossGroup()) { @@ -107,9 +107,10 @@ private void printCross(NodeGroup nodeGroup) { sb1.append("(failed):").append(n.getId()).append(",failCount=") .append(n.getFailCount()).append(",connStatus=").append(n.getConnectStatus()).append("\n"); } - LoggerUtil.logger(nodeGroup.getChainId()).info(sb1.toString()); - LoggerUtil.logger(nodeGroup.getChainId()).info("END @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); - LoggerUtil.logger(nodeGroup.getChainId()).info(""); + //TODO pierre test + LoggerUtil.logger(nodeGroup.getChainId()).debug(sb1.toString()); + LoggerUtil.logger(nodeGroup.getChainId()).debug("END @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + LoggerUtil.logger(nodeGroup.getChainId()).debug(""); } private void printLocalNet(NodeGroup nodeGroup) { @@ -149,8 +150,9 @@ private void printLocalNet(NodeGroup nodeGroup) { sb1.append("(failed):").append(n.getId()).append(",failCount=") .append(n.getFailCount()).append(",connStatus=").append(n.getConnectStatus()).append("\n"); } - LoggerUtil.logger(nodeGroup.getChainId()).info(sb1.toString()); - LoggerUtil.logger(nodeGroup.getChainId()).info("END @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); - LoggerUtil.logger(nodeGroup.getChainId()).info(""); + //TODO pierre test + LoggerUtil.logger(nodeGroup.getChainId()).debug(sb1.toString()); + LoggerUtil.logger(nodeGroup.getChainId()).debug("END @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + LoggerUtil.logger(nodeGroup.getChainId()).debug(""); } } diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/PeerCacheMsgSendTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/PeerCacheMsgSendTask.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/PeerCacheMsgSendTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/PeerCacheMsgSendTask.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/RPCCacheMsgSendTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/RPCCacheMsgSendTask.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/RPCCacheMsgSendTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/RPCCacheMsgSendTask.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/SaveNodeInfoTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/SaveNodeInfoTask.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/SaveNodeInfoTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/SaveNodeInfoTask.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/ShareAddressTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/ShareAddressTask.java similarity index 97% rename from module/nuls-network/src/main/java/io/nuls/network/task/ShareAddressTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/ShareAddressTask.java index 24811a2a63..a67ee2e996 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/task/ShareAddressTask.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/task/ShareAddressTask.java @@ -24,8 +24,8 @@ */ package io.nuls.network.task; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.manager.ConnectionManager; import io.nuls.network.manager.MessageManager; import io.nuls.network.manager.NodeGroupManager; @@ -45,7 +45,7 @@ */ public class ShareAddressTask implements Runnable { - private final NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + private final NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); private NodeGroup nodeGroup = null; private boolean isCross = false; diff --git a/module/nuls-network/src/main/java/io/nuls/network/task/TimeTask.java b/module/nuls-cores/src/main/java/io/nuls/network/task/TimeTask.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/task/TimeTask.java rename to module/nuls-cores/src/main/java/io/nuls/network/task/TimeTask.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/utils/IpUtil.java b/module/nuls-cores/src/main/java/io/nuls/network/utils/IpUtil.java similarity index 98% rename from module/nuls-network/src/main/java/io/nuls/network/utils/IpUtil.java rename to module/nuls-cores/src/main/java/io/nuls/network/utils/IpUtil.java index 9fc84e5ea0..e50f2afd00 100644 --- a/module/nuls-network/src/main/java/io/nuls/network/utils/IpUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/network/utils/IpUtil.java @@ -24,9 +24,9 @@ */ package io.nuls.network.utils; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; -import io.nuls.network.cfg.NetworkConfig; import io.nuls.network.constant.NetworkConstant; import java.net.*; @@ -50,7 +50,7 @@ public class IpUtil { } public static boolean isSelf(String ip) { - NetworkConfig networkConfig = SpringLiteContext.getBean(NetworkConfig.class); + NulsCoresConfig networkConfig = SpringLiteContext.getBean(NulsCoresConfig.class); return (ips.contains(ip) || networkConfig.getLocalIps().contains(ip)); } diff --git a/module/nuls-network/src/main/java/io/nuls/network/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/network/utils/LoggerUtil.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/network/utils/LoggerUtil.java diff --git a/module/nuls-network/src/main/java/io/nuls/network/utils/MessageUtil.java b/module/nuls-cores/src/main/java/io/nuls/network/utils/MessageUtil.java similarity index 100% rename from module/nuls-network/src/main/java/io/nuls/network/utils/MessageUtil.java rename to module/nuls-cores/src/main/java/io/nuls/network/utils/MessageUtil.java diff --git a/module/nuls-cores/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java new file mode 100644 index 0000000000..61615e7f1d --- /dev/null +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java @@ -0,0 +1,75 @@ +package io.nuls.protocol; + +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; +import io.nuls.core.core.annotation.Autowired; +import io.nuls.core.core.annotation.Component; +import io.nuls.core.log.Log; +import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.modulebootstrap.Module; +import io.nuls.protocol.manager.ChainManager; + +/** + * 协议升级模块启动类 + * + * @author captain + * @version 1.0 + * @date 19-3-4 下午4:09 + */ +@Component +public class ProtocolUpdateBootstrap implements INulsCoresBootstrap { + + @Autowired + public static NulsCoresConfig protocolConfig; + + @Autowired + private ChainManager chainManager; + + @Override + public int order() { + return 1; + } + + @Override + public void mainFunction(String[] args) { + this.init(); + } + + /** + * 返回当前模块的描述信息 + * @return + */ + @Override + public Module moduleInfo() { + return new Module(ModuleE.PU.abbr, "1.0"); + } + + public void init() { + try { + chainManager.initChain(); + } catch (Exception e) { + Log.error("ProtocolUpdateBootstrap init error!"); + throw new RuntimeException(e); + } + } + + + private boolean doStart() { + try { + //启动链 + chainManager.runChain(); + } catch (Exception e) { + Log.error("protocol module doStart error!"); + return false; + } + Log.info("protocol module ready"); + return true; + } + + @Override + public void onDependenciesReady() { + doStart(); + Log.info("protocol onDependenciesReady"); + } + +} diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/constant/CommandConstant.java b/module/nuls-cores/src/main/java/io/nuls/protocol/constant/CommandConstant.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/constant/CommandConstant.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/constant/CommandConstant.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/constant/Constant.java b/module/nuls-cores/src/main/java/io/nuls/protocol/constant/Constant.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/constant/Constant.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/constant/Constant.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/constant/ProtocolErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/protocol/constant/ProtocolErrorCode.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/constant/ProtocolErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/constant/ProtocolErrorCode.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/protocol/manager/ChainManager.java similarity index 94% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/manager/ChainManager.java index c8903af64e..1c4de98916 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/manager/ChainManager.java @@ -24,15 +24,18 @@ */ package io.nuls.protocol.manager; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.core.rpc.model.ModuleE; import io.nuls.protocol.constant.Constant; import io.nuls.protocol.model.ProtocolContext; import io.nuls.protocol.service.ProtocolService; import io.nuls.protocol.utils.ConfigLoader; +import java.io.File; import java.util.List; /** @@ -47,10 +50,13 @@ public class ChainManager { @Autowired private ProtocolService protocolService; + @Autowired + private NulsCoresConfig config; public void initChain() { //加载配置 ConfigLoader.load(); + RocksDBService.init(config.getDataPath() + File.separator + ModuleE.PU.name); ContextManager.chainIds.forEach(this::initTable); } diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/manager/ContextManager.java b/module/nuls-cores/src/main/java/io/nuls/protocol/manager/ContextManager.java similarity index 94% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/manager/ContextManager.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/manager/ContextManager.java index 661f2f2542..c68ad122b5 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/manager/ContextManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/manager/ContextManager.java @@ -21,7 +21,7 @@ package io.nuls.protocol.manager; import io.nuls.base.basic.ProtocolVersion; -import io.nuls.protocol.model.ChainParameters; +import io.nuls.common.ConfigBean; import io.nuls.protocol.model.ProtocolContext; import io.nuls.protocol.utils.LoggerUtil; @@ -48,7 +48,7 @@ public class ContextManager { private ContextManager() { } - public static void init(ChainParameters parameter, List versions) { + public static void init(ConfigBean parameter, List versions) { ProtocolContext protocolContext = new ProtocolContext(); int chainId = parameter.getChainId(); chainIds.add(chainId); diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolContext.java b/module/nuls-cores/src/main/java/io/nuls/protocol/model/ProtocolContext.java similarity index 97% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolContext.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/model/ProtocolContext.java index 417e53928a..c00576bce7 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolContext.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/model/ProtocolContext.java @@ -24,6 +24,7 @@ import io.nuls.base.basic.ProtocolVersion; import io.nuls.base.protocol.Protocol; +import io.nuls.common.ConfigBean; import io.nuls.core.log.logback.NulsLogger; import io.nuls.protocol.model.po.StatisticsInfo; @@ -93,7 +94,7 @@ public class ProtocolContext { /** * 链的运行时参数 */ - private ChainParameters parameters; + private ConfigBean parameters; /** * 记录通用日志 @@ -190,11 +191,11 @@ public void setLastValidStatisticsInfo(StatisticsInfo lastValidStatisticsInfo) { this.lastValidStatisticsInfo = lastValidStatisticsInfo; } - public ChainParameters getParameters() { + public ConfigBean getParameters() { return parameters; } - public void setParameters(ChainParameters parameters) { + public void setParameters(ConfigBean parameters) { this.parameters = parameters; } diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/po/ProtocolVersionPo.java b/module/nuls-cores/src/main/java/io/nuls/protocol/model/po/ProtocolVersionPo.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/po/ProtocolVersionPo.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/model/po/ProtocolVersionPo.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/po/StatisticsInfo.java b/module/nuls-cores/src/main/java/io/nuls/protocol/model/po/StatisticsInfo.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/po/StatisticsInfo.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/model/po/StatisticsInfo.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java b/module/nuls-cores/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java similarity index 99% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java index 751e806799..784bb8e0a4 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/rpc/ProtocolResource.java @@ -56,6 +56,7 @@ * @date 18-11-9 下午2:04 */ @Component +@NulsCoresCmd(module = ModuleE.PU) public class ProtocolResource extends BaseCmd { @Autowired private ProtocolService service; diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/call/BlockCall.java b/module/nuls-cores/src/main/java/io/nuls/protocol/rpc/call/BlockCall.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/call/BlockCall.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/rpc/call/BlockCall.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java b/module/nuls-cores/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java similarity index 96% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java index 586ece2024..169d503622 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/rpc/call/VersionChangeNotifier.java @@ -26,7 +26,8 @@ public class VersionChangeNotifier { public static boolean notify(int chainId, short version) { long begin = System.nanoTime(); List noticedModule = new ArrayList<>(); - noticedModule.add(ModuleE.CS.abbr); + noticedModule.add(ModuleE.NC.abbr); + /*noticedModule.add(ModuleE.CS.abbr); noticedModule.add(ModuleE.BL.abbr); noticedModule.add(ModuleE.AC.abbr); noticedModule.add(ModuleE.LG.abbr); @@ -37,7 +38,7 @@ public static boolean notify(int chainId, short version) { if (ModuleHelper.isSupportCrossChain()) { noticedModule.add(ModuleE.CC.abbr); noticedModule.add(ModuleE.CM.abbr); - } + }*/ for (String module : noticedModule) { long l = System.nanoTime(); Map params = new HashMap<>(4); diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/service/ProtocolService.java b/module/nuls-cores/src/main/java/io/nuls/protocol/service/ProtocolService.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/service/ProtocolService.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/service/ProtocolService.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java similarity index 97% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java index 31ad756b93..ec1565de8e 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/service/impl/ProtocolServiceImpl.java @@ -23,12 +23,11 @@ import io.nuls.base.basic.ProtocolVersion; import io.nuls.base.data.BlockExtendsData; import io.nuls.base.data.BlockHeader; +import io.nuls.common.ConfigBean; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; -import io.nuls.core.exception.NulsException; import io.nuls.core.log.logback.NulsLogger; import io.nuls.protocol.manager.ContextManager; -import io.nuls.protocol.model.ChainParameters; import io.nuls.protocol.model.ProtocolContext; import io.nuls.protocol.model.po.ProtocolVersionPo; import io.nuls.protocol.model.po.StatisticsInfo; @@ -196,7 +195,7 @@ public boolean save(int chainId, BlockHeader blockHeader) { //重新计算统计信息 proportionMap.merge(newProtocolVersion, 1, Integer::sum); } - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); short interval = parameters.getInterval(); //每1000块进行一次统计 if (count == interval) { @@ -238,7 +237,6 @@ public boolean save(int chainId, BlockHeader blockHeader) { } //设置新协议版本 context.setCurrentProtocolVersion(statictisProtocolVersion); - System.out.println("---------协议升级 save block statictisProtocolVersion----------," + statictisProtocolVersion.getVersion()); context.setCurrentProtocolVersionCount(statisticsInfo.getCount()); protocolService.saveCurrentProtocolVersionCount(chainId, context.getCurrentProtocolVersionCount()); context.getProtocolVersionHistory().push(statictisProtocolVersion); @@ -313,7 +311,7 @@ public boolean rollback(int chainId, BlockHeader blockHeader) { proportionMap.merge(newProtocolVersion, 1, (a, b) -> a - b); } //缓存统计总数==0时,从数据库加载上一条统计记录 - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); short interval = parameters.getInterval(); //区块高度到达阈值,从数据库删除一条统计记录 if (count < 0) { @@ -365,7 +363,7 @@ private boolean validate(BlockExtendsData data, ProtocolContext context){ if (currentProtocolVersion.getVersion() > blockVersion) { return false; } - ChainParameters parameters = context.getParameters(); + ConfigBean parameters = context.getParameters(); byte effectiveRatio = data.getEffectiveRatio(); if (effectiveRatio < parameters.getEffectiveRatioMinimum()) { return false; diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/ProtocolVersionStorageService.java b/module/nuls-cores/src/main/java/io/nuls/protocol/storage/ProtocolVersionStorageService.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/ProtocolVersionStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/storage/ProtocolVersionStorageService.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/StatisticsStorageService.java b/module/nuls-cores/src/main/java/io/nuls/protocol/storage/StatisticsStorageService.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/StatisticsStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/storage/StatisticsStorageService.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/ProtocolVersionStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/protocol/storage/impl/ProtocolVersionStorageServiceImpl.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/ProtocolVersionStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/storage/impl/ProtocolVersionStorageServiceImpl.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/StatisticsStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/protocol/storage/impl/StatisticsStorageServiceImpl.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/StatisticsStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/storage/impl/StatisticsStorageServiceImpl.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/ConfigLoader.java b/module/nuls-cores/src/main/java/io/nuls/protocol/utils/ConfigLoader.java similarity index 83% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/ConfigLoader.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/utils/ConfigLoader.java index 68309a257a..de7bb95110 100644 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/ConfigLoader.java +++ b/module/nuls-cores/src/main/java/io/nuls/protocol/utils/ConfigLoader.java @@ -23,15 +23,17 @@ package io.nuls.protocol.utils; import io.nuls.base.basic.ProtocolVersion; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.io.IoUtils; import io.nuls.core.log.Log; import io.nuls.core.parse.JSONUtils; import io.nuls.protocol.manager.ContextManager; -import io.nuls.protocol.model.ChainParameters; -import io.nuls.protocol.storage.ParametersStorageService; +import java.io.File; +import java.util.ArrayList; import java.util.List; import static io.nuls.protocol.ProtocolUpdateBootstrap.protocolConfig; @@ -47,13 +49,11 @@ @Component public class ConfigLoader { - @Autowired - private static ParametersStorageService service; private static List versions; static { try { - versions = JSONUtils.json2list(IoUtils.read(PROTOCOL_CONFIG_FILE), ProtocolVersion.class); + versions = JSONUtils.json2list(IoUtils.read("protocol" + File.separator + PROTOCOL_CONFIG_FILE), ProtocolVersion.class); } catch (Exception e) { Log.error(e); System.exit(1); @@ -66,11 +66,11 @@ public class ConfigLoader { * */ public static void load() { - List list = service.getList(); + List list = new ArrayList<>(CommonContext.CONFIG_BEAN_MAP.values()); if (list == null || list.size() == 0) { loadDefault(); } else { - for (ChainParameters chainParameters : list) { + for (ConfigBean chainParameters : list) { ContextManager.init(chainParameters, versions); } } @@ -81,9 +81,7 @@ public static void load() { * */ private static void loadDefault() { - int chainId = protocolConfig.getChainId(); ContextManager.init(protocolConfig, versions); - service.save(protocolConfig, chainId); } } diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/protocol/utils/LoggerUtil.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/utils/LoggerUtil.java diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/PoUtil.java b/module/nuls-cores/src/main/java/io/nuls/protocol/utils/PoUtil.java similarity index 100% rename from module/nuls-protocol-update/src/main/java/io/nuls/protocol/utils/PoUtil.java rename to module/nuls-cores/src/main/java/io/nuls/protocol/utils/PoUtil.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java b/module/nuls-cores/src/main/java/io/nuls/transaction/TransactionBootstrap.java similarity index 50% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/TransactionBootstrap.java index 8eb244b847..27ca6b08d2 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/TransactionBootstrap.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/TransactionBootstrap.java @@ -25,86 +25,69 @@ package io.nuls.transaction; import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.RegisterHelper; +import io.nuls.common.CommonVersionChangeInvoker; +import io.nuls.common.INulsCoresBootstrap; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.crypto.HexUtil; import io.nuls.core.model.StringUtils; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.transaction.constant.TxConfig; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.constant.TxContext; -import io.nuls.transaction.constant.TxDBConstant; import io.nuls.transaction.manager.ChainManager; -import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.utils.DBUtil; +import io.nuls.transaction.rpc.upgrade.TxVersionChangeInvoker; import io.nuls.transaction.utils.TxUtil; +import java.io.File; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.Set; import static io.nuls.transaction.utils.LoggerUtil.LOG; -import static java.nio.charset.StandardCharsets.UTF_8; /** * @author: Charlie * @date: 2019/3/4 */ @Component -public class TransactionBootstrap extends RpcModule { +public class TransactionBootstrap implements INulsCoresBootstrap { @Autowired - private TxConfig txConfig; + private NulsCoresConfig txConfig; @Autowired private AddressPrefixDatas addressPrefixDatas; @Autowired private ChainManager chainManager; - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); + @Override + public int order() { + return 3; } @Override + public void mainFunction(String[] args) { + this.init(); + } + public void init() { try { - //初始化地址工具 - AddressTool.init(addressPrefixDatas); - //初始化系统参数 - initSys(); //初始化数据库配置文件 initDB(); initTransactionContext(); chainManager.initChain(); TxUtil.blackHolePublicKey = HexUtil.decode(txConfig.getBlackHolePublicKey()); - ModuleHelper.init(this); } catch (Exception e) { LOG.error("Transaction init error!"); LOG.error(e); } } - @Override - public boolean doStart() { + private boolean doStart() { try { chainManager.runChain(); - while (!isDependencieReady(ModuleE.NW.abbr)){ - LOG.debug("wait depend modules ready"); - Thread.sleep(2000L); - } LOG.info("Transaction Ready..."); return true; } catch (Exception e) { @@ -116,57 +99,11 @@ public boolean doStart() { @Override - public void onDependenciesReady(Module module) { - // add by pierre at 2019-12-04 增加与智能合约模块的连接标志 - LOG.info("module [{}] is connected, version [{}]", module.getName(), module.getVersion()); - if (ModuleE.SC.abbr.equals(module.getName())) { - txConfig.setCollectedSmartContractModule(true); - } - // end code by pierre - if (ModuleE.NW.abbr.equals(module.getName())) { - RegisterHelper.registerMsg(ProtocolGroupManager.getOneProtocol()); - } - if (ModuleE.PU.abbr.equals(module.getName())) { - chainManager.getChainMap().keySet().forEach(RegisterHelper::registerProtocol); - } - } - - @Override - public RpcModuleState onDependenciesReady() { - LOG.info("Transaction onDependenciesReady"); - NulsDateUtils.getInstance().start(); - return RpcModuleState.Running; - } - - @Override - public RpcModuleState onDependenciesLoss(Module module) { + public void onDependenciesReady() { + doStart(); // add by pierre at 2019-12-04 增加与智能合约模块的连接标志 - LOG.info("module [{}] has lost connection, version [{}]", module.getName(), module.getVersion()); - if (ModuleE.SC.abbr.equals(module.getName())) { - txConfig.setCollectedSmartContractModule(false); - } + txConfig.setCollectedSmartContractModule(true); // end code by pierre - if (ModuleE.BL.abbr.equals(module.getName())) { - for(Chain chain : chainManager.getChainMap().values()) { - chain.getProcessTxStatus().set(false); - } - } - if (ModuleE.CS.abbr.equals(module.getName())) { - for(Chain chain : chainManager.getChainMap().values()) { - chain.getPackaging().set(false); - } - } - return RpcModuleState.Ready; - } - - @Override - public Module[] declareDependent() { - return new Module[]{ - Module.build(ModuleE.NW), - Module.build(ModuleE.LG), - Module.build(ModuleE.BL), - Module.build(ModuleE.AC) - }; } @Override @@ -174,29 +111,10 @@ public Module moduleInfo() { return new Module(ModuleE.TX.abbr, TxConstant.RPC_VERSION); } - @Override - public Set getRpcCmdPackage() { - return Set.of(TxConstant.TX_CMD_PATH); - } - - /** - * 初始化系统编码 - */ - private void initSys() { - try { - System.setProperty(TxConstant.SYS_ALLOW_NULL_ARRAY_ELEMENT, "true"); - System.setProperty(TxConstant.SYS_FILE_ENCODING, UTF_8.name()); - } catch (Exception e) { - LOG.error(e); - } - } - public void initDB() { try { //数据文件存储地址 - RocksDBService.init(txConfig.getTxDataRoot()); - //模块配置表 - DBUtil.createTable(TxDBConstant.DB_MODULE_CONGIF); + RocksDBService.init(txConfig.getDataPath() + File.separator + ModuleE.TX.name); } catch (Exception e) { LOG.error(e); } diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/cache/PackablePool.java b/module/nuls-cores/src/main/java/io/nuls/transaction/cache/PackablePool.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/cache/PackablePool.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/cache/PackablePool.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxCmd.java b/module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxCmd.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxCmd.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxCmd.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConstant.java b/module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxConstant.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConstant.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxConstant.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxContext.java b/module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxContext.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxContext.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxContext.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxDBConstant.java b/module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxDBConstant.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxDBConstant.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxDBConstant.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxErrorCode.java b/module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxErrorCode.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxErrorCode.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxErrorCode.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/manager/ChainManager.java b/module/nuls-cores/src/main/java/io/nuls/transaction/manager/ChainManager.java similarity index 91% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/manager/ChainManager.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/manager/ChainManager.java index 80b4f3e82a..27399d05dd 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/manager/ChainManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/manager/ChainManager.java @@ -25,17 +25,17 @@ package io.nuls.transaction.manager; import io.nuls.base.protocol.ProtocolLoader; +import io.nuls.common.CommonContext; +import io.nuls.common.ConfigBean; import io.nuls.core.core.annotation.Autowired; import io.nuls.core.core.annotation.Component; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.rockdb.constant.DBErrorCode; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.transaction.constant.TxConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.transaction.constant.TxDBConstant; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.po.TransactionNetPO; -import io.nuls.transaction.storage.ConfigStorageService; import io.nuls.transaction.utils.LoggerUtil; import java.util.Map; @@ -55,14 +55,11 @@ @Component public class ChainManager { - @Autowired - private ConfigStorageService configService; - @Autowired private SchedulerManager schedulerManager; @Autowired - private TxConfig txConfig; + private NulsCoresConfig txConfig; private Map chainMap = new ConcurrentHashMap<>(); @@ -83,7 +80,7 @@ public void initChain() throws Exception { initTable(chain); chainMap.put(chainId, chain); chain.getLogger().debug("Chain:{} init success..", chainId); - ProtocolLoader.load(chainId); + //ProtocolLoader.load(chainId); } } @@ -123,7 +120,7 @@ private Map configChain() { 读取数据库链信息配置 Read database chain information configuration */ - Map configMap = configService.getList(); + Map configMap = CommonContext.CONFIG_BEAN_MAP; /* 如果系统是第一次运行，则本地数据库没有存储链信息，此时需要从配置文件读取主链配置信息 @@ -132,11 +129,7 @@ private Map configChain() { */ if (configMap.isEmpty()) { ConfigBean configBean = txConfig; - - boolean saveSuccess = configService.save(configBean, configBean.getChainId()); - if(saveSuccess){ - configMap.put(configBean.getChainId(), configBean); - } + configMap.put(configBean.getChainId(), configBean); } return configMap; } catch (Exception e) { diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/manager/SchedulerManager.java b/module/nuls-cores/src/main/java/io/nuls/transaction/manager/SchedulerManager.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/manager/SchedulerManager.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/manager/SchedulerManager.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/manager/TxManager.java b/module/nuls-cores/src/main/java/io/nuls/transaction/manager/TxManager.java similarity index 86% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/manager/TxManager.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/manager/TxManager.java index 80a8913a1f..ba47612408 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/manager/TxManager.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/manager/TxManager.java @@ -27,6 +27,7 @@ import io.nuls.base.data.Transaction; import io.nuls.core.constant.TxType; import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.transaction.model.bo.Chain; import io.nuls.transaction.model.bo.TxRegister; @@ -94,18 +95,6 @@ public static boolean isSystemTx(Chain chain, Transaction tx) { return txRegister.getSystemTx(); } - /** - * 是否是智能合约交易 - * @param txType - * @return - */ - public static boolean isSmartContract(Chain chain, int txType){ - if(ModuleE.SC.abbr.equals(getModuleCode(chain, txType))){ - return true; - } - return false; - } - /** * 是否是智能合约非系统交易 * @param txType @@ -113,7 +102,7 @@ public static boolean isSmartContract(Chain chain, int txType){ */ public static boolean isUnSystemSmartContract(Chain chain, int txType){ TxRegister txRegister = getTxRegister(chain, txType); - if(ModuleE.SC.abbr.equals(txRegister.getModuleCode()) && !txRegister.getSystemTx()){ + if(ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(txType)) && !txRegister.getSystemTx()){ return true; } return false; @@ -123,7 +112,7 @@ public static boolean isUnSystemSmartContract(TxRegister txRegister){ if (txRegister == null) { return false; } - if(ModuleE.SC.abbr.equals(txRegister.getModuleCode()) && !txRegister.getSystemTx()){ + if(ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(txRegister.getTxType())) && !txRegister.getSystemTx()){ return true; } return false; @@ -139,14 +128,14 @@ public static boolean isSystemSmartContract(Chain chain, int txType){ if (txRegister == null) { return false; } - return ModuleE.SC.abbr.equals(txRegister.getModuleCode()) && txRegister.getSystemTx(); + return ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(txType)) && txRegister.getSystemTx(); } public static boolean isSystemSmartContract(TxRegister txRegister){ if (txRegister == null) { return false; } - return ModuleE.SC.abbr.equals(txRegister.getModuleCode()) && txRegister.getSystemTx(); + return ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(txRegister.getTxType())) && txRegister.getSystemTx(); } public static boolean isCrossTx(int txType) { diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/message/BroadcastTxMessage.java b/module/nuls-cores/src/main/java/io/nuls/transaction/message/BroadcastTxMessage.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/message/BroadcastTxMessage.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/message/BroadcastTxMessage.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/message/ForwardTxMessage.java b/module/nuls-cores/src/main/java/io/nuls/transaction/message/ForwardTxMessage.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/message/ForwardTxMessage.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/message/ForwardTxMessage.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/message/GetTxMessage.java b/module/nuls-cores/src/main/java/io/nuls/transaction/message/GetTxMessage.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/message/GetTxMessage.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/message/GetTxMessage.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/message/handler/BroadcastTxMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/transaction/message/handler/BroadcastTxMessageHandler.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/message/handler/BroadcastTxMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/message/handler/BroadcastTxMessageHandler.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/message/handler/ForwardTxMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/transaction/message/handler/ForwardTxMessageHandler.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/message/handler/ForwardTxMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/message/handler/ForwardTxMessageHandler.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/message/handler/GetTxMessageHandler.java b/module/nuls-cores/src/main/java/io/nuls/transaction/message/handler/GetTxMessageHandler.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/message/handler/GetTxMessageHandler.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/message/handler/GetTxMessageHandler.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/Chain.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/Chain.java similarity index 99% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/Chain.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/Chain.java index 5372f3385e..01228e2da0 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/Chain.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/Chain.java @@ -3,10 +3,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; +import io.nuls.common.ConfigBean; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.model.ByteArrayWrapper; import io.nuls.transaction.constant.TxConstant; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.po.TransactionNetPO; import java.util.*; diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/OrphanSortItem.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/OrphanSortItem.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/OrphanSortItem.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/OrphanSortItem.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/OrphanSortResult.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/OrphanSortResult.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/OrphanSortResult.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/OrphanSortResult.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/Orphans.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/Orphans.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/Orphans.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/Orphans.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxPackage.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxPackage.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxPackage.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxPackage.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxPackageWrapper.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxPackageWrapper.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxPackageWrapper.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxPackageWrapper.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxRegister.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxRegister.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxRegister.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxRegister.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxVerifyWrapper.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxVerifyWrapper.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/TxVerifyWrapper.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/TxVerifyWrapper.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/VerifyLedgerResult.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/VerifyLedgerResult.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/VerifyLedgerResult.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/VerifyLedgerResult.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/VerifyResult.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/VerifyResult.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/VerifyResult.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/bo/VerifyResult.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/dto/AccountBlockDTO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/CoinDTO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/dto/CoinDTO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/CoinDTO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/dto/CoinDTO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/ModuleTxRegisterDTO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/dto/ModuleTxRegisterDTO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/dto/ModuleTxRegisterDTO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/dto/ModuleTxRegisterDTO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/po/AccountBlockExtendPO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/po/AccountBlockPO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/TransactionConfirmedPO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/po/TransactionConfirmedPO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/TransactionConfirmedPO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/po/TransactionConfirmedPO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/TransactionNetPO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/po/TransactionNetPO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/TransactionNetPO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/po/TransactionNetPO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/TransactionUnconfirmedPO.java b/module/nuls-cores/src/main/java/io/nuls/transaction/model/po/TransactionUnconfirmedPO.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/model/po/TransactionUnconfirmedPO.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/model/po/TransactionUnconfirmedPO.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/AccountCall.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/ConsensusCall.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/ConsensusCall.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/ConsensusCall.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/ConsensusCall.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/ContractCall.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/ContractCall.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/ContractCall.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/ContractCall.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/LedgerCall.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/LedgerCall.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/LedgerCall.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/LedgerCall.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java similarity index 86% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java index 5fd374dbbe..2cdf47a205 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/NetworkCall.java @@ -111,35 +111,6 @@ public static boolean sendToNode(Chain chain, BaseBusinessMessage message, Strin } } - /** - * 向网络模块注册网络消息协议 - * register Network Message Protocol with Network Module - * - * @return - */ - public static boolean registerProtocol() throws NulsException { - try { - Map params = new HashMap<>(TxConstant.INIT_CAPACITY_4); - List> cmds = new ArrayList<>(); - params.put("role", ModuleE.TX.abbr); - //模块启动时向网络模块注册网络协议处理器 - List list = List.of(NW_NEW_HASH, NW_ASK_TX, NW_RECEIVE_TX); - for (String s : list) { - Map cmd = new HashMap<>(TxConstant.INIT_CAPACITY_4); - cmd.put("protocolCmd", s); - cmd.put("handler", s); - cmds.add(cmd); - } - params.put("protocolCmds", cmds); - - TransactionCall.requestAndResponse(ModuleE.NW.abbr, "nw_protocolRegister", params); - return true; - } catch (RuntimeException e) { - LOG.error(e); - throw new NulsException(TxErrorCode.RPC_REQUEST_FAILD); - } - } - /** * 转发交易 * 发送hash到其他节点 diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/TransactionCall.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/TransactionCall.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/call/TransactionCall.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/call/TransactionCall.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java similarity index 99% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java index 2325506edf..825e1efdbc 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/cmd/ClientCmd.java @@ -60,6 +60,7 @@ * @date: 2019/3/12 */ @Component +@NulsCoresCmd(module = ModuleE.TX) public class ClientCmd extends BaseCmd { @Autowired diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java similarity index 99% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java index afbcf75c4c..5f9077d1ba 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/cmd/TransactionCmd.java @@ -46,6 +46,7 @@ * @date: 2018/11/12 */ @Component +@NulsCoresCmd(module = ModuleE.TX) public class TransactionCmd extends BaseCmd { @Autowired diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java similarity index 92% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java index f3bbb87826..e1c4ad4357 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/rpc/upgrade/TxVersionChangeInvoker.java @@ -1,6 +1,7 @@ package io.nuls.transaction.rpc.upgrade; import io.nuls.base.data.Transaction; +import io.nuls.common.CommonVersionChangeInvoker; import io.nuls.core.basic.VersionChangeInvoker; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.exception.NulsException; @@ -21,6 +22,12 @@ */ public class TxVersionChangeInvoker implements VersionChangeInvoker { + private static TxVersionChangeInvoker txVersionChangeInvoker = new TxVersionChangeInvoker(); + private TxVersionChangeInvoker() {} + public static TxVersionChangeInvoker instance() { + return txVersionChangeInvoker; + } + @Override public void process(int chainId) { /** diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/ConfirmedTxService.java b/module/nuls-cores/src/main/java/io/nuls/transaction/service/ConfirmedTxService.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/service/ConfirmedTxService.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/service/ConfirmedTxService.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/TxService.java b/module/nuls-cores/src/main/java/io/nuls/transaction/service/TxService.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/service/TxService.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/service/TxService.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java similarity index 96% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java index 04cea81a49..b1119d34b9 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/ConfirmedTxServiceImpl.java @@ -14,9 +14,10 @@ import io.nuls.core.exception.NulsException; import io.nuls.core.log.logback.NulsLogger; import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.transaction.cache.PackablePool; -import io.nuls.transaction.constant.TxConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.constant.TxContext; import io.nuls.transaction.constant.TxErrorCode; @@ -58,7 +59,7 @@ public class ConfirmedTxServiceImpl implements ConfirmedTxService { private TxService txService; @Autowired - private TxConfig txConfig; + private NulsCoresConfig txConfig; @Override public TransactionConfirmedPO getConfirmedTransaction(Chain chain, NulsHash hash) { @@ -148,11 +149,11 @@ private boolean saveBlockTxList(Chain chain, List txStrList, String bloc logger.debug("[保存区块] 存已确认交易DB 执行时间:{}", NulsDateUtils.getCurrentTimeMillis()- dbStart); // add by pierre at 2019-12-01 把type10交易发送到合约模块筛选处理，需要协议升级 done - if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_V250 + /*if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_V250 && !crossChainTxList.isEmpty() && txConfig.isCollectedSmartContractModule()) { - List contractList = moduleVerifyMap.computeIfAbsent(ModuleE.SC.abbr, code -> new ArrayList<>()); + List contractList = moduleVerifyMap.computeIfAbsent(ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.SC.abbr), code -> new ArrayList<>()); contractList.addAll(crossChainTxList); - } + } 模块合并后，所有交易都在一个module中，不必再单独添加，否则导致交易重复*/ // end code by pierre long commitStart = NulsDateUtils.getCurrentTimeMillis(); if (!commitTxs(chain, moduleVerifyMap, blockHeaderStr, true)) { @@ -336,11 +337,11 @@ public boolean rollbackTxList(Chain chain, List txHashList, String blo logger.debug("[回滚区块] 回滚账本 执行时间:{}", NulsDateUtils.getCurrentTimeMillis() - ledgerStart); // add by pierre at 2019-12-01 把type10交易发送到合约模块筛选处理，需要协议升级 done - if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_V250 + /*if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_V250 && !crossChainTxList.isEmpty() && txConfig.isCollectedSmartContractModule()) { - List contractList = moduleVerifyMap.computeIfAbsent(ModuleE.SC.abbr, code -> new ArrayList<>()); + List contractList = moduleVerifyMap.computeIfAbsent(ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.SC.abbr), code -> new ArrayList<>()); contractList.addAll(crossChainTxList); - } + } 模块合并后，所有交易都在一个module中，不必再单独添加，否则导致交易重复*/ // end code by pierre long moduleStart = NulsDateUtils.getCurrentTimeMillis(); if (!rollbackTxs(chain, moduleVerifyMap, blockHeaderStr, true)) { diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java similarity index 97% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java index f10d0bc36b..c28e33558d 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java @@ -49,11 +49,12 @@ import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; +import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.core.thread.ThreadUtils; import io.nuls.core.thread.commom.NulsThreadFactory; import io.nuls.transaction.cache.PackablePool; -import io.nuls.transaction.constant.TxConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.constant.TxContext; import io.nuls.transaction.constant.TxErrorCode; @@ -102,7 +103,7 @@ public class TxServiceImpl implements TxService { private ConfirmedTxStorageService confirmedTxStorageService; @Autowired - private TxConfig txConfig; + private NulsCoresConfig txConfig; private ExecutorService verifySignExecutor = ThreadUtils.createThreadPool(Runtime.getRuntime().availableProcessors(), CACHED_SIZE, new NulsThreadFactory(TxConstant.VERIFY_TX_SIGN_THREAD)); @@ -180,9 +181,8 @@ public void newTx(Chain chain, Transaction tx) throws NulsException { unconfirmedTxStorageService.putTx(chain.getChainId(), tx); //广播完整交易 boolean broadcastResult = false; - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); for (int i = 0; i < 3; i++) { - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { broadcastResult = NetworkCall.forwardTxHash(chain, tx.getHash()); } else { broadcastResult = NetworkCall.broadcastTx(chain, tx); @@ -338,7 +338,7 @@ public void baseValidateTx(Chain chain, Transaction tx, TxRegister txRegister) t * @throws NulsException */ private void validateTxSignature(Transaction tx, TxRegister txRegister, Chain chain) throws NulsException { - if (!txRegister.getVerifySignature() || txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (!txRegister.getVerifySignature() || ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { //注册时不需要验证签名的交易(一些系统交易),以及跨链模块的交易(单独处理). return; } @@ -419,7 +419,7 @@ private void validateTxSignatureProtocol12(Transaction tx, TxRegister txRegister if (null == coinData || null == coinData.getFrom() || coinData.getFrom().size() <= 0) { throw new NulsException(TxErrorCode.COINDATA_NOT_FOUND); } - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { if (tx.getType() != TxType.CROSS_CHAIN) { // 跨链模块的非本链协议的跨链转账交易(单独处理). return; @@ -598,7 +598,7 @@ private void validateCoinFromBase(Chain chain, TxRegister txRegister, List listTo) throws NulsException { String moduleCode = txRegister.getModuleCode(); int type = txRegister.getTxType(); - if (type != TxType.COIN_BASE && !ModuleE.SC.abbr.equals(moduleCode)) { + if (type != TxType.COIN_BASE && !ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(type))) { if (null == listTo || listTo.size() == 0) { throw new NulsException(TxErrorCode.COINTO_NOT_FOUND); } @@ -668,7 +668,7 @@ private void validateCoinToBase(Chain chain, TxRegister txRegister, List //验证交易地址合法性,跨链模块交易需要取地址中的原始链id来验证 int validAddressChainId = txChainId; - if (ModuleE.CC.abbr.equals(txRegister.getModuleCode())) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(type))) { validAddressChainId = AddressTool.getChainIdByAddress(coinTo.getAddress()); } if (!AddressTool.validAddress(validAddressChainId, addr)) { @@ -913,9 +913,8 @@ public TxPackage getPackableTxs(Chain chain, long endtimestamp, long maxTxDataSi break; } } else { - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); //限制跨链交易数量 - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { if (corssTxCount + (++batchCorssTxCount) >= TxConstant.PACKAGE_CROSS_TX_MAX_COUNT) { //限制单个区块包含的跨链交易总数，超过跨链交易最大个数，放回去, 然后停止获取交易 packablePool.add(chain, tx); @@ -928,7 +927,7 @@ public TxPackage getPackableTxs(Chain chain, long endtimestamp, long maxTxDataSi } } //限制智能合约交易数量 - boolean isContract = txRegister.getModuleCode().equals(ModuleE.SC.abbr); + boolean isContract = ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType())); if (isContract) { if (contractTxCount + (++batchContractTxCount) >= packageContractTxMaxCount) { //限制单个区块包含的跨链交易总数，超过跨链交易最大个数，放回去, 然后停止获取交易 @@ -980,8 +979,8 @@ public TxPackage getPackableTxs(Chain chain, long endtimestamp, long maxTxDataSi Transaction transaction = txPackageWrapper.getTx(); TxRegister txRegister = TxManager.getTxRegister(chain, transaction.getType()); String moduleCode = txRegister.getModuleCode(); - boolean isSmartContractTx = moduleCode.equals(ModuleE.SC.abbr); - boolean isCrossTx = moduleCode.equals(ModuleE.CC.abbr); + boolean isSmartContractTx = ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(transaction.getType())); + boolean isCrossTx = ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(transaction.getType())); // add by pierre at 2019-11-02 跨链转账交易发送到智能合约模块进行解析，是否为合约资产跨链转账 需要协议升级 done if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_V250) { boolean isCrossTransferTx = TxType.CROSS_CHAIN == transaction.getType(); @@ -1314,21 +1313,20 @@ private Map processContractResult(Chain chain, List packingTxL List crossTransferList = new ArrayList<>(); for (TxPackageWrapper txPackageWrapper : packingTxList) { Transaction tx = txPackageWrapper.getTx(); - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); - if (txRegister.getModuleCode().equals(ModuleE.CS.abbr)) { + if (ModuleE.CS.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { consensusList.add(RPCUtil.encode(txPackageWrapper.getTx().serialize())); } - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { crossTransferList.add(RPCUtil.encode(txPackageWrapper.getTx().serialize())); } } consensusList.addAll(scNewConsensusList); crossTransferList.addAll(scNewTokenCrossTransferList); if (!consensusList.isEmpty()) { - isRollbackPackablePool = processContractTxs(chain, ModuleE.CS.abbr, consensusList, packingTxList, false); + isRollbackPackablePool = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CS.abbr), consensusList, packingTxList, false); } if (!isRollbackPackablePool && !crossTransferList.isEmpty()) { - isRollbackPackablePool = processContractTxs(chain, ModuleE.CC.abbr, crossTransferList, packingTxList, false); + isRollbackPackablePool = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CC.abbr), crossTransferList, packingTxList, false); } } if (!isRollbackPackablePool) { @@ -1879,25 +1877,24 @@ public Boolean call() { || txType == TxType.CONTRACT_STOP_AGENT) { continue; } - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); - if (txRegister.getModuleCode().equals(ModuleE.CS.abbr)) { + if (ModuleE.CS.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { consensusList.add(txVerifyWrapper.getTxStr()); } - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { crossTransferList.add(txVerifyWrapper.getTxStr()); } } consensusList.addAll(scNewConsensusList); crossTransferList.addAll(scNewTokenCrossTransferList); if (!consensusList.isEmpty()) { - boolean rsProcess = processContractTxs(chain, ModuleE.CS.abbr, consensusList, null, true); + boolean rsProcess = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CS.abbr), consensusList, null, true); if (rsProcess) { logger.error("contract tx consensus module verify fail."); throw new NulsException(TxErrorCode.CONTRACT_VERIFY_FAIL); } } if (!crossTransferList.isEmpty()) { - boolean rsProcess = processContractTxs(chain, ModuleE.CC.abbr, crossTransferList, null, true); + boolean rsProcess = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CC.abbr), crossTransferList, null, true); if (rsProcess) { logger.error("contract tx cross-chain module verify fail."); throw new NulsException(TxErrorCode.CONTRACT_VERIFY_FAIL); @@ -2180,9 +2177,8 @@ public TxPackage getPackableTxsV8(Chain chain, long endtimestamp, long maxTxData break; } } else { - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); //限制跨链交易数量 - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { if (corssTxCount + (++batchCorssTxCount) >= TxConstant.PACKAGE_CROSS_TX_MAX_COUNT) { //限制单个区块包含的跨链交易总数，超过跨链交易最大个数，放回去, 然后停止获取交易 packablePool.add(chain, tx); @@ -2195,7 +2191,7 @@ public TxPackage getPackableTxsV8(Chain chain, long endtimestamp, long maxTxData } } //限制智能合约交易数量 - boolean isContract = txRegister.getModuleCode().equals(ModuleE.SC.abbr); + boolean isContract = ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType())); if (isContract) { if (contractTxCount + (++batchContractTxCount) >= packageContractTxMaxCount) { //限制单个区块包含的跨链交易总数，超过跨链交易最大个数，放回去, 然后停止获取交易 @@ -2246,9 +2242,8 @@ public TxPackage getPackableTxsV8(Chain chain, long endtimestamp, long maxTxData TxPackageWrapper txPackageWrapper = it.next(); Transaction transaction = txPackageWrapper.getTx(); TxRegister txRegister = TxManager.getTxRegister(chain, transaction.getType()); - String moduleCode = txRegister.getModuleCode(); - boolean isSmartContractTx = moduleCode.equals(ModuleE.SC.abbr); - boolean isCrossTx = moduleCode.equals(ModuleE.CC.abbr); + boolean isSmartContractTx = ModuleE.SC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(transaction.getType())); + boolean isCrossTx = ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(transaction.getType())); // add by pierre at 2019-11-02 跨链转账交易发送到智能合约模块进行解析，是否为合约资产跨链转账 需要协议升级 done if (ProtocolGroupManager.getCurrentVersion(chain.getChainId()) >= TxContext.UPDATE_VERSION_V250) { boolean isCrossTransferTx = TxType.CROSS_CHAIN == transaction.getType(); @@ -2695,25 +2690,24 @@ public Boolean call() { || txType == TxType.CONTRACT_STOP_AGENT) { continue; } - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); - if (txRegister.getModuleCode().equals(ModuleE.CS.abbr)) { + if (ModuleE.CS.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { consensusList.add(txVerifyWrapper.getTxStr()); } - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { crossTransferList.add(txVerifyWrapper.getTxStr()); } } consensusList.addAll(scNewConsensusList); crossTransferList.addAll(scNewTokenCrossTransferList); if (!consensusList.isEmpty()) { - boolean rsProcess = processContractTxs(chain, ModuleE.CS.abbr, consensusList, null, true); + boolean rsProcess = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CS.abbr), consensusList, null, true); if (rsProcess) { logger.error("contract tx consensus module verify fail."); throw new NulsException(TxErrorCode.CONTRACT_VERIFY_FAIL); } } if (!crossTransferList.isEmpty()) { - boolean rsProcess = processContractTxs(chain, ModuleE.CC.abbr, crossTransferList, null, true); + boolean rsProcess = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CC.abbr), crossTransferList, null, true); if (rsProcess) { logger.error("contract tx cross-chain module verify fail."); throw new NulsException(TxErrorCode.CONTRACT_VERIFY_FAIL); @@ -2857,21 +2851,20 @@ private Map processContractResultV8(Chain chain, List packingT List crossTransferList = new ArrayList<>(); for (TxPackageWrapper txPackageWrapper : packingTxList) { Transaction tx = txPackageWrapper.getTx(); - TxRegister txRegister = TxManager.getTxRegister(chain, tx.getType()); - if (txRegister.getModuleCode().equals(ModuleE.CS.abbr)) { + if (ModuleE.CS.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { consensusList.add(RPCUtil.encode(txPackageWrapper.getTx().serialize())); } - if (txRegister.getModuleCode().equals(ModuleE.CC.abbr)) { + if (ModuleE.CC.abbr.equals(ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(tx.getType()))) { crossTransferList.add(RPCUtil.encode(txPackageWrapper.getTx().serialize())); } } consensusList.addAll(scNewConsensusList); crossTransferList.addAll(scNewTokenCrossTransferList); if (!consensusList.isEmpty()) { - isRollbackPackablePool = processContractTxs(chain, ModuleE.CS.abbr, consensusList, packingTxList, false); + isRollbackPackablePool = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CS.abbr), consensusList, packingTxList, false); } if (!isRollbackPackablePool && !crossTransferList.isEmpty()) { - isRollbackPackablePool = processContractTxs(chain, ModuleE.CC.abbr, crossTransferList, packingTxList, false); + isRollbackPackablePool = processContractTxs(chain, ResponseMessageProcessor.ROLE_MAPPING.get(ModuleE.CC.abbr), crossTransferList, packingTxList, false); } } if (!isRollbackPackablePool) { diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/ConfirmedTxStorageService.java b/module/nuls-cores/src/main/java/io/nuls/transaction/storage/ConfirmedTxStorageService.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/storage/ConfirmedTxStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/storage/ConfirmedTxStorageService.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/UnconfirmedTxStorageService.java b/module/nuls-cores/src/main/java/io/nuls/transaction/storage/UnconfirmedTxStorageService.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/storage/UnconfirmedTxStorageService.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/storage/UnconfirmedTxStorageService.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/ConfirmedTxStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/transaction/storage/impl/ConfirmedTxStorageServiceImpl.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/ConfirmedTxStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/storage/impl/ConfirmedTxStorageServiceImpl.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/UnconfirmedTxStorageServiceImpl.java b/module/nuls-cores/src/main/java/io/nuls/transaction/storage/impl/UnconfirmedTxStorageServiceImpl.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/UnconfirmedTxStorageServiceImpl.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/storage/impl/UnconfirmedTxStorageServiceImpl.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java b/module/nuls-cores/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java similarity index 97% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java index 96078e371a..8cc96504df 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/task/ClearUnconfirmedTxProcessTask.java @@ -25,10 +25,10 @@ package io.nuls.transaction.task; import io.nuls.base.data.Transaction; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.transaction.cache.PackablePool; -import io.nuls.transaction.constant.TxConfig; import io.nuls.transaction.model.bo.Chain; import io.nuls.transaction.model.po.TransactionUnconfirmedPO; import io.nuls.transaction.service.TxService; @@ -46,7 +46,7 @@ public class ClearUnconfirmedTxProcessTask implements Runnable { private PackablePool packablePool = SpringLiteContext.getBean(PackablePool.class); private TxService txService = SpringLiteContext.getBean(TxService.class); private UnconfirmedTxStorageService unconfirmedTxStorageService = SpringLiteContext.getBean(UnconfirmedTxStorageService.class); - private TxConfig txConfig = SpringLiteContext.getBean(TxConfig.class); + private NulsCoresConfig txConfig = SpringLiteContext.getBean(NulsCoresConfig.class); private Chain chain; public ClearUnconfirmedTxProcessTask(Chain chain) { diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/task/NetTxProcessTask.java b/module/nuls-cores/src/main/java/io/nuls/transaction/task/NetTxProcessTask.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/task/NetTxProcessTask.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/task/NetTxProcessTask.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/task/OrphanTxProcessTask.java b/module/nuls-cores/src/main/java/io/nuls/transaction/task/OrphanTxProcessTask.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/task/OrphanTxProcessTask.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/task/OrphanTxProcessTask.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/DBUtil.java b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/DBUtil.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/utils/DBUtil.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/utils/DBUtil.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/HashSetDuplicateProcessor.java b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/HashSetDuplicateProcessor.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/utils/HashSetDuplicateProcessor.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/utils/HashSetDuplicateProcessor.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/LoggerUtil.java b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/LoggerUtil.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/utils/LoggerUtil.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/utils/LoggerUtil.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/OrphanSort.java b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/OrphanSort.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/utils/OrphanSort.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/utils/OrphanSort.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxDuplicateRemoval.java b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/TxDuplicateRemoval.java similarity index 100% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxDuplicateRemoval.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/utils/TxDuplicateRemoval.java diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/TxUtil.java similarity index 99% rename from module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java rename to module/nuls-cores/src/main/java/io/nuls/transaction/utils/TxUtil.java index 4590fe1fc0..b7f2bb6cf7 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/utils/TxUtil.java +++ b/module/nuls-cores/src/main/java/io/nuls/transaction/utils/TxUtil.java @@ -29,11 +29,11 @@ import io.nuls.base.basic.NulsByteBuffer; import io.nuls.base.data.*; import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.common.NulsCoresConfig; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.transaction.constant.TxConfig; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.constant.TxContext; import io.nuls.transaction.constant.TxErrorCode; @@ -128,7 +128,7 @@ public static boolean isNulsAsset(Coin coin) { } public static boolean isNulsAsset(int chainId, int assetId) { - TxConfig txConfig = SpringLiteContext.getBean(TxConfig.class); + NulsCoresConfig txConfig = SpringLiteContext.getBean(NulsCoresConfig.class); return chainId == txConfig.getMainChainId() && assetId == txConfig.getMainAssetId(); } diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/config/BlockchainNetConfig.java b/module/nuls-cores/src/main/java/org/ethereum/config/BlockchainNetConfig.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/config/BlockchainNetConfig.java rename to module/nuls-cores/src/main/java/org/ethereum/config/BlockchainNetConfig.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/config/CommonConfig.java b/module/nuls-cores/src/main/java/org/ethereum/config/CommonConfig.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/config/CommonConfig.java rename to module/nuls-cores/src/main/java/org/ethereum/config/CommonConfig.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/config/Constants.java b/module/nuls-cores/src/main/java/org/ethereum/config/Constants.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/config/Constants.java rename to module/nuls-cores/src/main/java/org/ethereum/config/Constants.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/config/DefaultConfig.java b/module/nuls-cores/src/main/java/org/ethereum/config/DefaultConfig.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/config/DefaultConfig.java rename to module/nuls-cores/src/main/java/org/ethereum/config/DefaultConfig.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/config/SystemProperties.java b/module/nuls-cores/src/main/java/org/ethereum/config/SystemProperties.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/config/SystemProperties.java rename to module/nuls-cores/src/main/java/org/ethereum/config/SystemProperties.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/core/AccountState.java b/module/nuls-cores/src/main/java/org/ethereum/core/AccountState.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/core/AccountState.java rename to module/nuls-cores/src/main/java/org/ethereum/core/AccountState.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/core/Block.java b/module/nuls-cores/src/main/java/org/ethereum/core/Block.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/core/Block.java rename to module/nuls-cores/src/main/java/org/ethereum/core/Block.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/core/BlockHeader.java b/module/nuls-cores/src/main/java/org/ethereum/core/BlockHeader.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/core/BlockHeader.java rename to module/nuls-cores/src/main/java/org/ethereum/core/BlockHeader.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/core/Repository.java b/module/nuls-cores/src/main/java/org/ethereum/core/Repository.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/core/Repository.java rename to module/nuls-cores/src/main/java/org/ethereum/core/Repository.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/HashUtil.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/HashUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/HashUtil.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/HashUtil.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/Digest.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/Digest.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/Digest.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/Digest.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/DigestEngine.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/DigestEngine.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/DigestEngine.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/DigestEngine.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/Keccak256.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/Keccak256.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/Keccak256.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/Keccak256.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/Keccak512.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/Keccak512.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/Keccak512.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/Keccak512.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/KeccakCore.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/KeccakCore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/cryptohash/KeccakCore.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/cryptohash/KeccakCore.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECAlgorithmParameters.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECAlgorithmParameters.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECAlgorithmParameters.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECAlgorithmParameters.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECKeyAgreement.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECKeyAgreement.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECKeyAgreement.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECKeyAgreement.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECKeyFactory.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECKeyFactory.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECKeyFactory.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECKeyFactory.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECKeyPairGenerator.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECKeyPairGenerator.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECKeyPairGenerator.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECKeyPairGenerator.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECSignatureFactory.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECSignatureFactory.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/ECSignatureFactory.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/jce/ECSignatureFactory.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/SpongyCastleProvider.java b/module/nuls-cores/src/main/java/org/ethereum/crypto/jce/SpongyCastleProvider.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/crypto/jce/SpongyCastleProvider.java rename to module/nuls-cores/src/main/java/org/ethereum/crypto/jce/SpongyCastleProvider.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AbstractCachedSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/AbstractCachedSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AbstractCachedSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/AbstractCachedSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AbstractChainedSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/AbstractChainedSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AbstractChainedSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/AbstractChainedSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AsyncFlushable.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/AsyncFlushable.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AsyncFlushable.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/AsyncFlushable.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AsyncWriteCache.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/AsyncWriteCache.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/AsyncWriteCache.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/AsyncWriteCache.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BatchSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/BatchSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BatchSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/BatchSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BatchSourceWriter.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/BatchSourceWriter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BatchSourceWriter.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/BatchSourceWriter.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BloomFilter.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/BloomFilter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BloomFilter.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/BloomFilter.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BloomedSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/BloomedSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/BloomedSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/BloomedSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/CachedSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/CachedSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/CachedSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/CachedSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/CountingBytesSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/CountingBytesSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/CountingBytesSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/CountingBytesSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/CountingQuotientFilter.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/CountingQuotientFilter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/CountingQuotientFilter.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/CountingQuotientFilter.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/DataSourceArray.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/DataSourceArray.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/DataSourceArray.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/DataSourceArray.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/DbSettings.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/DbSettings.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/DbSettings.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/DbSettings.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/DbSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/DbSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/DbSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/DbSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/HashedKeySource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/HashedKeySource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/HashedKeySource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/HashedKeySource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/JournalSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/JournalSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/JournalSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/JournalSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/MemSizeEstimator.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/MemSizeEstimator.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/MemSizeEstimator.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/MemSizeEstimator.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/MultiCache.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/MultiCache.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/MultiCache.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/MultiCache.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/NoDeleteSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/NoDeleteSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/NoDeleteSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/NoDeleteSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/NodeKeyCompositor.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/NodeKeyCompositor.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/NodeKeyCompositor.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/NodeKeyCompositor.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/ObjectDataSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/ObjectDataSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/ObjectDataSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/ObjectDataSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/PrefixLookupSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/PrefixLookupSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/PrefixLookupSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/PrefixLookupSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/QuotientFilter.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/QuotientFilter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/QuotientFilter.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/QuotientFilter.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/ReadCache.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/ReadCache.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/ReadCache.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/ReadCache.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/ReadWriteCache.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/ReadWriteCache.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/ReadWriteCache.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/ReadWriteCache.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/Serializer.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/Serializer.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/Serializer.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/Serializer.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/Serializers.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/Serializers.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/Serializers.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/Serializers.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/Source.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/Source.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/Source.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/Source.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/SourceChainBox.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/SourceChainBox.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/SourceChainBox.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/SourceChainBox.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/SourceCodec.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/SourceCodec.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/SourceCodec.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/SourceCodec.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/WriteCache.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/WriteCache.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/WriteCache.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/WriteCache.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/XorDataSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/XorDataSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/XorDataSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/XorDataSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/inmem/HashMapDB.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/inmem/HashMapDB.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/inmem/HashMapDB.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/inmem/HashMapDB.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/inmem/HashMapDBSimple.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/inmem/HashMapDBSimple.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/inmem/HashMapDBSimple.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/inmem/HashMapDBSimple.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java b/module/nuls-cores/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java similarity index 98% rename from module/nuls-smart-contract/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java rename to module/nuls-cores/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java index 9994ccd813..92a5f44718 100644 --- a/module/nuls-smart-contract/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java +++ b/module/nuls-cores/src/main/java/org/ethereum/datasource/rocksdb/RocksDbDataSource.java @@ -17,7 +17,7 @@ */ package org.ethereum.datasource.rocksdb; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.util.Log; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.model.StringUtils; @@ -119,7 +119,7 @@ private RocksDB createTable(String area) { if (StringUtils.isBlank(area)) { throw new RuntimeException("empty area"); } - ContractConfig contractConfig = SpringLiteContext.getBean(ContractConfig.class); + NulsCoresConfig contractConfig = SpringLiteContext.getBean(NulsCoresConfig.class); String dataPath = contractConfig.getDataPath(); File pathDir = DBUtils.loadDataPath(dataPath); dataPath = pathDir.getPath(); diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/AbstractBlockstore.java b/module/nuls-cores/src/main/java/org/ethereum/db/AbstractBlockstore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/AbstractBlockstore.java rename to module/nuls-cores/src/main/java/org/ethereum/db/AbstractBlockstore.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/BlockStore.java b/module/nuls-cores/src/main/java/org/ethereum/db/BlockStore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/BlockStore.java rename to module/nuls-cores/src/main/java/org/ethereum/db/BlockStore.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/BlockStoreDummy.java b/module/nuls-cores/src/main/java/org/ethereum/db/BlockStoreDummy.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/BlockStoreDummy.java rename to module/nuls-cores/src/main/java/org/ethereum/db/BlockStoreDummy.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/ByteArrayWrapper.java b/module/nuls-cores/src/main/java/org/ethereum/db/ByteArrayWrapper.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/ByteArrayWrapper.java rename to module/nuls-cores/src/main/java/org/ethereum/db/ByteArrayWrapper.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/ContractDetails.java b/module/nuls-cores/src/main/java/org/ethereum/db/ContractDetails.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/ContractDetails.java rename to module/nuls-cores/src/main/java/org/ethereum/db/ContractDetails.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/DbFlushManager.java b/module/nuls-cores/src/main/java/org/ethereum/db/DbFlushManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/DbFlushManager.java rename to module/nuls-cores/src/main/java/org/ethereum/db/DbFlushManager.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/HeaderStore.java b/module/nuls-cores/src/main/java/org/ethereum/db/HeaderStore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/HeaderStore.java rename to module/nuls-cores/src/main/java/org/ethereum/db/HeaderStore.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/IndexedBlockStore.java b/module/nuls-cores/src/main/java/org/ethereum/db/IndexedBlockStore.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/IndexedBlockStore.java rename to module/nuls-cores/src/main/java/org/ethereum/db/IndexedBlockStore.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/PruneManager.java b/module/nuls-cores/src/main/java/org/ethereum/db/PruneManager.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/PruneManager.java rename to module/nuls-cores/src/main/java/org/ethereum/db/PruneManager.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/RepositoryImpl.java b/module/nuls-cores/src/main/java/org/ethereum/db/RepositoryImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/RepositoryImpl.java rename to module/nuls-cores/src/main/java/org/ethereum/db/RepositoryImpl.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/RepositoryRoot.java b/module/nuls-cores/src/main/java/org/ethereum/db/RepositoryRoot.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/RepositoryRoot.java rename to module/nuls-cores/src/main/java/org/ethereum/db/RepositoryRoot.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/RepositoryWrapper.java b/module/nuls-cores/src/main/java/org/ethereum/db/RepositoryWrapper.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/RepositoryWrapper.java rename to module/nuls-cores/src/main/java/org/ethereum/db/RepositoryWrapper.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/StateSource.java b/module/nuls-cores/src/main/java/org/ethereum/db/StateSource.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/StateSource.java rename to module/nuls-cores/src/main/java/org/ethereum/db/StateSource.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/index/ArrayListIndex.java b/module/nuls-cores/src/main/java/org/ethereum/db/index/ArrayListIndex.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/index/ArrayListIndex.java rename to module/nuls-cores/src/main/java/org/ethereum/db/index/ArrayListIndex.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/index/Index.java b/module/nuls-cores/src/main/java/org/ethereum/db/index/Index.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/index/Index.java rename to module/nuls-cores/src/main/java/org/ethereum/db/index/Index.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/Chain.java b/module/nuls-cores/src/main/java/org/ethereum/db/prune/Chain.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/Chain.java rename to module/nuls-cores/src/main/java/org/ethereum/db/prune/Chain.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/ChainItem.java b/module/nuls-cores/src/main/java/org/ethereum/db/prune/ChainItem.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/ChainItem.java rename to module/nuls-cores/src/main/java/org/ethereum/db/prune/ChainItem.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/Pruner.java b/module/nuls-cores/src/main/java/org/ethereum/db/prune/Pruner.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/Pruner.java rename to module/nuls-cores/src/main/java/org/ethereum/db/prune/Pruner.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/Segment.java b/module/nuls-cores/src/main/java/org/ethereum/db/prune/Segment.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/db/prune/Segment.java rename to module/nuls-cores/src/main/java/org/ethereum/db/prune/Segment.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/facade/Repository.java b/module/nuls-cores/src/main/java/org/ethereum/facade/Repository.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/facade/Repository.java rename to module/nuls-cores/src/main/java/org/ethereum/facade/Repository.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/CollectFullSetOfNodes.java b/module/nuls-cores/src/main/java/org/ethereum/trie/CollectFullSetOfNodes.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/CollectFullSetOfNodes.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/CollectFullSetOfNodes.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/CountAllNodes.java b/module/nuls-cores/src/main/java/org/ethereum/trie/CountAllNodes.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/CountAllNodes.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/CountAllNodes.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/Node.java b/module/nuls-cores/src/main/java/org/ethereum/trie/Node.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/Node.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/Node.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/SecureTrie.java b/module/nuls-cores/src/main/java/org/ethereum/trie/SecureTrie.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/SecureTrie.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/SecureTrie.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/TraceAllNodes.java b/module/nuls-cores/src/main/java/org/ethereum/trie/TraceAllNodes.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/TraceAllNodes.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/TraceAllNodes.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/Trie.java b/module/nuls-cores/src/main/java/org/ethereum/trie/Trie.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/Trie.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/Trie.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/TrieImpl.java b/module/nuls-cores/src/main/java/org/ethereum/trie/TrieImpl.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/TrieImpl.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/TrieImpl.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/trie/TrieKey.java b/module/nuls-cores/src/main/java/org/ethereum/trie/TrieKey.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/trie/TrieKey.java rename to module/nuls-cores/src/main/java/org/ethereum/trie/TrieKey.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/ALock.java b/module/nuls-cores/src/main/java/org/ethereum/util/ALock.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/ALock.java rename to module/nuls-cores/src/main/java/org/ethereum/util/ALock.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/BIUtil.java b/module/nuls-cores/src/main/java/org/ethereum/util/BIUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/BIUtil.java rename to module/nuls-cores/src/main/java/org/ethereum/util/BIUtil.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/BuildInfo.java b/module/nuls-cores/src/main/java/org/ethereum/util/BuildInfo.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/BuildInfo.java rename to module/nuls-cores/src/main/java/org/ethereum/util/BuildInfo.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/ByteArrayMap.java b/module/nuls-cores/src/main/java/org/ethereum/util/ByteArrayMap.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/ByteArrayMap.java rename to module/nuls-cores/src/main/java/org/ethereum/util/ByteArrayMap.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/ByteArraySet.java b/module/nuls-cores/src/main/java/org/ethereum/util/ByteArraySet.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/ByteArraySet.java rename to module/nuls-cores/src/main/java/org/ethereum/util/ByteArraySet.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/ByteUtil.java b/module/nuls-cores/src/main/java/org/ethereum/util/ByteUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/ByteUtil.java rename to module/nuls-cores/src/main/java/org/ethereum/util/ByteUtil.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/CollectionUtils.java b/module/nuls-cores/src/main/java/org/ethereum/util/CollectionUtils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/CollectionUtils.java rename to module/nuls-cores/src/main/java/org/ethereum/util/CollectionUtils.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/CompactEncoder.java b/module/nuls-cores/src/main/java/org/ethereum/util/CompactEncoder.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/CompactEncoder.java rename to module/nuls-cores/src/main/java/org/ethereum/util/CompactEncoder.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/CopyOnWriteMap.java b/module/nuls-cores/src/main/java/org/ethereum/util/CopyOnWriteMap.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/CopyOnWriteMap.java rename to module/nuls-cores/src/main/java/org/ethereum/util/CopyOnWriteMap.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/DecodeResult.java b/module/nuls-cores/src/main/java/org/ethereum/util/DecodeResult.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/DecodeResult.java rename to module/nuls-cores/src/main/java/org/ethereum/util/DecodeResult.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/ExecutorPipeline.java b/module/nuls-cores/src/main/java/org/ethereum/util/ExecutorPipeline.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/ExecutorPipeline.java rename to module/nuls-cores/src/main/java/org/ethereum/util/ExecutorPipeline.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/FastByteComparisons.java b/module/nuls-cores/src/main/java/org/ethereum/util/FastByteComparisons.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/FastByteComparisons.java rename to module/nuls-cores/src/main/java/org/ethereum/util/FastByteComparisons.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/FileUtil.java b/module/nuls-cores/src/main/java/org/ethereum/util/FileUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/FileUtil.java rename to module/nuls-cores/src/main/java/org/ethereum/util/FileUtil.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/MinMaxMap.java b/module/nuls-cores/src/main/java/org/ethereum/util/MinMaxMap.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/MinMaxMap.java rename to module/nuls-cores/src/main/java/org/ethereum/util/MinMaxMap.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/RLP.java b/module/nuls-cores/src/main/java/org/ethereum/util/RLP.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/RLP.java rename to module/nuls-cores/src/main/java/org/ethereum/util/RLP.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/RLPElement.java b/module/nuls-cores/src/main/java/org/ethereum/util/RLPElement.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/RLPElement.java rename to module/nuls-cores/src/main/java/org/ethereum/util/RLPElement.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/RLPItem.java b/module/nuls-cores/src/main/java/org/ethereum/util/RLPItem.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/RLPItem.java rename to module/nuls-cores/src/main/java/org/ethereum/util/RLPItem.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/RLPList.java b/module/nuls-cores/src/main/java/org/ethereum/util/RLPList.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/RLPList.java rename to module/nuls-cores/src/main/java/org/ethereum/util/RLPList.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/SetAdapter.java b/module/nuls-cores/src/main/java/org/ethereum/util/SetAdapter.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/SetAdapter.java rename to module/nuls-cores/src/main/java/org/ethereum/util/SetAdapter.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/TimeUtils.java b/module/nuls-cores/src/main/java/org/ethereum/util/TimeUtils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/TimeUtils.java rename to module/nuls-cores/src/main/java/org/ethereum/util/TimeUtils.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/Utils.java b/module/nuls-cores/src/main/java/org/ethereum/util/Utils.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/Utils.java rename to module/nuls-cores/src/main/java/org/ethereum/util/Utils.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/Value.java b/module/nuls-cores/src/main/java/org/ethereum/util/Value.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/Value.java rename to module/nuls-cores/src/main/java/org/ethereum/util/Value.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/util/blockchain/EtherUtil.java b/module/nuls-cores/src/main/java/org/ethereum/util/blockchain/EtherUtil.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/util/blockchain/EtherUtil.java rename to module/nuls-cores/src/main/java/org/ethereum/util/blockchain/EtherUtil.java diff --git a/module/nuls-smart-contract/src/main/java/org/ethereum/vm/DataWord.java b/module/nuls-cores/src/main/java/org/ethereum/vm/DataWord.java similarity index 100% rename from module/nuls-smart-contract/src/main/java/org/ethereum/vm/DataWord.java rename to module/nuls-cores/src/main/java/org/ethereum/vm/DataWord.java diff --git a/module/nuls-cross-chain/base-lib/src/main/resources/languages/en.properties b/module/nuls-cores/src/main/resources/account/FileEmpty.txt similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/resources/languages/en.properties rename to module/nuls-cores/src/main/resources/account/FileEmpty.txt diff --git a/module/nuls-block/src/main/resources/genesis-block.json b/module/nuls-cores/src/main/resources/block/genesis-block.json similarity index 100% rename from module/nuls-block/src/main/resources/genesis-block.json rename to module/nuls-cores/src/main/resources/block/genesis-block.json diff --git a/module/nuls-cores/src/main/resources/chain/FileEmpty.txt b/module/nuls-cores/src/main/resources/chain/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/main/resources/consensus/FileEmpty.txt b/module/nuls-cores/src/main/resources/consensus/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-smart-contract/src/main/resources/nrc1155.json b/module/nuls-cores/src/main/resources/contract/nrc1155.json similarity index 100% rename from module/nuls-smart-contract/src/main/resources/nrc1155.json rename to module/nuls-cores/src/main/resources/contract/nrc1155.json diff --git a/module/nuls-smart-contract/src/main/resources/nrc20.json b/module/nuls-cores/src/main/resources/contract/nrc20.json similarity index 100% rename from module/nuls-smart-contract/src/main/resources/nrc20.json rename to module/nuls-cores/src/main/resources/contract/nrc20.json diff --git a/module/nuls-smart-contract/src/main/resources/nrc721.json b/module/nuls-cores/src/main/resources/contract/nrc721.json similarity index 100% rename from module/nuls-smart-contract/src/main/resources/nrc721.json rename to module/nuls-cores/src/main/resources/contract/nrc721.json diff --git a/module/nuls-smart-contract/src/main/resources/used_classes_base b/module/nuls-cores/src/main/resources/contract/used_classes_base similarity index 100% rename from module/nuls-smart-contract/src/main/resources/used_classes_base rename to module/nuls-cores/src/main/resources/contract/used_classes_base diff --git a/module/nuls-smart-contract/src/main/resources/used_classes_sdk b/module/nuls-cores/src/main/resources/contract/used_classes_sdk similarity index 100% rename from module/nuls-smart-contract/src/main/resources/used_classes_sdk rename to module/nuls-cores/src/main/resources/contract/used_classes_sdk diff --git a/module/nuls-smart-contract/src/main/resources/used_classes_sdk_v14 b/module/nuls-cores/src/main/resources/contract/used_classes_sdk_v14 similarity index 100% rename from module/nuls-smart-contract/src/main/resources/used_classes_sdk_v14 rename to module/nuls-cores/src/main/resources/contract/used_classes_sdk_v14 diff --git a/module/nuls-smart-contract/src/main/resources/used_classes_sdk_v15 b/module/nuls-cores/src/main/resources/contract/used_classes_sdk_v15 similarity index 100% rename from module/nuls-smart-contract/src/main/resources/used_classes_sdk_v15 rename to module/nuls-cores/src/main/resources/contract/used_classes_sdk_v15 diff --git a/module/nuls-smart-contract/src/main/resources/used_classes_sdk_v8 b/module/nuls-cores/src/main/resources/contract/used_classes_sdk_v8 similarity index 100% rename from module/nuls-smart-contract/src/main/resources/used_classes_sdk_v8 rename to module/nuls-cores/src/main/resources/contract/used_classes_sdk_v8 diff --git a/module/nuls-cross-chain/base-lib/src/main/resources/db_config.properties b/module/nuls-cores/src/main/resources/crosschain/db_config.properties similarity index 100% rename from module/nuls-cross-chain/base-lib/src/main/resources/db_config.properties rename to module/nuls-cores/src/main/resources/crosschain/db_config.properties diff --git a/module/nuls-cores/src/main/resources/languages/en.properties b/module/nuls-cores/src/main/resources/languages/en.properties new file mode 100644 index 0000000000..a59bdbcdb8 --- /dev/null +++ b/module/nuls-cores/src/main/resources/languages/en.properties @@ -0,0 +1,307 @@ +ac_0000=Password is wrong +ac_0001=Account does not exist +ac_0002=The account has been encrypted. +ac_0003=Account already exists +ac_0004=Address wrong +ac_0005=Alias already exists. +ac_0006=Alias is not exist +ac_0007=The account already set an alias +ac_0008=The account is not encrypted +ac_0009=There is another AliasTransaction set the same alias +ac_0010=Contains encrypted accounts +ac_0011=Contains unencrypted accounts +ac_0012=The private key is wrong +ac_0013=Delete alias error +ac_0014=The AccountKeystore file does not exist +ac_0015=The AccountKeystore file was damaged +ac_0016=The alias format wrong +ac_0017=The password format wrong +ac_0018=Decrypt account error +ac_0019=Account is encrypted and locked +ac_0020=Remark is too long +ac_0021=input is too small +ac_0022=must burn a NULS +ac_0023=sign count too large +ac_0024=is not current chain address +ac_0025=is multi signature address +ac_0026=is not multi signature address +ac_0027=asset not exist +ac_0028=insufficient balance +ac_0029=insufficient fee +ac_0030=The chain does not exist +ac_0031=CoinData data is incomplete +ac_0032=Transaction is not exist +ac_0033=Transaction coinData not found +ac_0034=Transaction data validation error +ac_0035=Transaction type error +ac_0036=Invalid transaction or unavailable in current version +ac_0037=The transaction data is too big +ac_0038=Transaction payer information does not exist +ac_0039=Transaction payee information does not exist +ac_0040=The chain id is error +ac_0041=The asset id is error +ac_0042=The signature address of the transaction does not match the coinfrom address +ac_0043=the address already signed the transaction +ac_0044=CoinTo has duplicate account assets +ac_0045=Save alias error +ac_0046=amount too small +ac_0047=Black hole addresses prohibit token spending +ac_0048=Remote response data not found +ac_0049=Transaction coinFrom underpayment +ac_0050=There can only be one multi-signature address +ac_0051=CoinData cannot have contract address +ac_0052=The contract address cannot participate in the creation of a multi-signature account +ac_0053=The multi-signature address cannot participate in the creation of a multi-signature account +ac_0054=The contract address cannot set alias +ac_0055=Multi-Sign account does not exist +ac_0056=Create Multi-Sign account failed +bl_0001=Chain switch failed +bl_0002=The local genesis block differ from network +bl_0003=Error occur when init local block +bl_0004=Error occur when saving genesis block +bl_0005=Update latest height error +bl_0006=Remove block header error +bl_0007=Transactions rollback error +bl_0008=Consensus rollback notice error +bl_0009=Protocol save notice error +bl_0010=Consensus save notice error +bl_0011=Transactions save error +bl_0012=Save block header error +bl_0013=Receive out of range block +bl_0014=Receive duplicate main block +bl_0015=Receive fork block +bl_0016=Receive irrelevant block +bl_0017=Block verify error +bl_0018=An exception occurred during block synchronization +cm_0001=Balance not enough +cm_0002=Param tx error +cm_0003=Not cross transaction +cm_0004=Parameter error +cm_1001=Chain ID already exist +cm_1002=Chain name length error +cm_1003=Chain not found +cm_1004=Chain address error +cm_1005=Chain status is incorrect +cm_1006=Chain Asset is more than 1 +cm_1007=Chain magic number already exist +cm_1008=Chain name already exist +cm_1009=Chain verifier list is empty +cm_1010=Signature bft ration error +cm_1011=Max signature count error +cm_1012=Chain address prefix error +cm_1013=Chain Once used,but disable now. you can use updatecrosschain cmd to update. +cm_1014=Chain in active. +cm_1015=ChainId=1 or chainId=2 is system chain. +cm_2000=Asset Symbol error +cm_2001=Asset Symbol length error +cm_2002=Asset Symbol already exist +cm_2003=JSON cannot be transfer to Asset object +cm_2004=The assets recovered must exceed 0.9 +cm_2005=Asset ID already exist +cm_2006=Asset name error +cm_2007=Asset name length error +cm_2008=The deposit nuls must be 200000 +cm_2009=Asset init number error +cm_2011=Asset decimal places error +cm_2013=The chain used to calculate is not a chain for registering the asset +cm_2014=Asset not exist +cm_2015=Asset number exceed initialization quantity +cm_2016=Asset Address Error +cm_2017=txHash Error +cm_2018=transaction register rpc call error +cm_2019=ledger balance rpc call error +cm_2020=Asset had already disable +cm_3000=Account validation error +cm_3001=Account signDigest error. +cs_0001=data error +cs_0002=tx not exist +cs_0003=agent do not exist +cs_0004=data do not exist +cs_0005=address is error +cs_0006=param is error +cs_0007=The packaging address cannot be the same as the agent address +cs_0008=The packaging address and reward addresses cannot be the same +cs_0009=Commission is out of range +cs_0010=Margin out of range +cs_0011=Token amount error +cs_0012=Transaction data validation error +cs_0013=Agent exist +cs_0014=Agent packing Address has been used +cs_0015=Credit ratio too low +cs_0016=Repeated transaction +cs_0017=Exceeding the maximum amount that can be entrusted +cs_0018=Less than the minimum guaranteed amount +cs_0019=Data Added Failure +cs_0020=Data rollback failure +cs_0021=Merkelgen Validation Error +cs_0022=Block Round data Validation Failed +cs_0023=Insufficient balance +cs_0024=Chains do not exist +cs_0025=Block red and yellow trades failed to verify +cs_0026=Block signature error +cs_0027=Red card transaction verification error +cs_0028=CoinBase transaction validation error +cs_0029=Verify that the transaction list is empty +cs_0030=Remote method call failed +cs_0031=Account Validation Error +cs_0032=Transaction Signature Verification Error +cs_0033=CoinData valid error +cs_0034=The entrusted transaction has withdrawn from the entrustment +cs_0035=The rollback withdrawal delegation transaction was not submitted +cs_0036=Try fork +cs_0037=Double speed +cs_0038=Get too many yellow cards +cs_0039=Conflict detection error +cs_0040=Insufficient handling fees +cs_0041=Error unlocking time +cs_0042=Transaction creator not signed +cs_0043=Agent creator not signed +cs_0044=Unsettled transaction must be initiated by the principal +sc_0001=Contract execute error +sc_0002=Contract address does not exist +sc_0003=Create contract tx error +sc_0004=Illegal contract address +sc_0005=Non-contractual transaction +sc_0006=Funds for non-contractual transaction cannot be transferred to the contract address +sc_0007=The format of the name is incorrect. +sc_0008=Non-NRC20 contract +sc_0009=Non-view method +sc_0010=Illegal contract code +sc_0011=Duplicate token name +sc_0012=The format of the symbol is incorrect. +sc_0013=Contract Locked +sc_0014=The value of decimals ranges from 0 to 18 +sc_0015=The value of totalSupply ranges from 1 to 2^256 - 1 +sc_0016=The gas price is error +sc_0017=Cannot delete contract when balance is not 0 +sc_0018=The contract deleter must be the contract creator +sc_0019=The contract has been deleted +sc_0020=Exceeded the maximum GAS limit for contract calls +sc_0021=Do not execute view methods +sc_0022=This contract does not accept direct transfers +sc_0023=Contract method does not exist +sc_0024=Transfer amount cannot be locked. +sc_0025=Insufficient balance to transfer to the contract address. +sc_0026=The contract creator is not the transaction creator. +sc_0027=The contract caller is not the transaction creator. +sc_0028=The contract deleter is not the transaction creator. +sc_0029=The contract deleter is not the contract creator. +sc_0030=That balance of the contract is abnormal. +sc_0031=The receiver is not the contract address. +sc_0032=Insufficient token balance +sc_0033=Different modules registered duplicate cmd +sc_0034=The type of NEW_TX does not support non-string array return values +sc_0035=Illegal operation, cannot transfer token, cannot send events, cannot transfer internally, cannot call contracts internally, cannot generate new transactions +sc_0036=The value of gas limit ranges from 25 to 10,000,000 +sc_0037=The chain id or assets id of coin is error. +sc_0038=The contract coin to is not empty. +sc_0039=The contract alias format error. +sc_0040=Duplicate transaction of contract return gas. +sc_0041=Illegal coinTo in the contract. +sc_0042=Illegal coinFrom in the contract. +sc_0043=The contract caller is not the transaction signer. +sc_0100=Insufficient balance +sc_0101=Transaction fee is not right +sc_0102=The amount of the transfer is too small +sc_0103=Transaction is not exist +sc_0104=Password is wrong +sc_0105=Account does not exist +sc_0106=Address wrong +sc_9999=Contract unknown error +cc_0001=Cross-Chain Transaction payer and payee cannot be the same Chain Account +cc_0002=No Payment Account for Cross-Chain Transactions +cc_0003=Cross-Chain Transactions Payment Accounts are not the same Chain Accounts +cc_0004=Cross-Chain Transaction Receiving Accounts is not the same Chain Account +cc_0005=Sorry, your credit is running low +cc_0006=There can only be one payment account for cross-chain transactions with multi-signature accounts. +cc_0007=Multi-Signed Account Cross-Chain Transaction Payment Account is not Multi-Signed Account +cc_0008=Multi-Signed Accounts Can't Issue Ordinary Cross-Chain Transactions +cc_0009=This account is not an encrypted account +cc_0010=Cross-Chain Transaction Payment Accounts Must Be Local Chain Accounts +cc_0011=Sorry, your credit is running low +cc_0012=Payment account and collection account cannot be omitted. +cc_0013=Interface call failed +cc_0014=Chain not exist +cc_0015=CoinData verify error +cc_0016=Transaction verify error +cc_0017=TxData verify error +cc_0018=Transaction commit fail +cc_0019=Transaction rollback fail +cc_0020=Not cross-chain transactions in this chain +cc_0021=Unregistered cross-chain transactions in this chain +cc_0022=Unregistered cross-chain transactions in target chain +cc_0023=Assets are registered across the chain +cc_0024=Cross-chain network unavailability +cc_0025=Chain unregistered +cc_0026=Chain Unregistered Verifier Information +cc_0027=Byzantine Verification Failure of Transaction Signature +cc_0028=Cross-Chain Asset Verification Error +cc_0029=Return address Buhe +cc_0030=Too many verifiers exited +lg_0001=Parameter error.tx is invalid. +lg_0002=Chain init Exception. +lg_1001=ORPHAN. +lg_1002=DOUBLE EXPENSES. +lg_1003=TX EXIST +lg_1004=BALANCE NOT ENOUGH +lg_1005=Tx from coin amount is less than to amount. +lg_1010=FAIL +lg_1011=ASSET DECIMAL PLACES ERROR +lg_1012=ASSET SYMBOL ERROR +lg_1013=ASSET NAME ERROR +lg_1014=ADDRESS ERROR +lg_1015=TX SIGNDIGEST ERROR +lg_1016=TX RPC ERROR +nw_0001=Net message error +nw_0002=Net message send fail +nw_0003=Net message send exception +nw_0004=Net message broadcast error +nw_0005=Peer node disconnect +nw_0006=Peer node miss channel exception +pu_0001=protocol update module save block error +pu_0002=protocol update module rollback block error +tx_0001=Transactions hash error +tx_0002=The coin-from address does not match the chain +tx_0003=The coin-to address does not match the chain +tx_0004=Insufficient fee +tx_0005=The asset id is error +tx_0006=CoinFrom not exist +tx_0007=CoinTo not exist +tx_0008=CoinFrom has duplicate account assets +tx_0009=CoinTo has duplicate account assets +tx_0010=CoinFroms not the same chain +tx_0011=CoinTo not the same chain +tx_0012=Transaction coinData not found +tx_0013=Transaction already exists +tx_0014=Transaction does not exist +tx_0015=Deserialize transaction error +tx_0016=Deserialize coinData error +tx_0017=The signature address of the transaction does not match the coinfrom address +tx_0018=The block height update cannot be repackaged for the rest of the time +tx_0019=Package get transactions time out +tx_0020=The chain is not found +tx_0021=Invalid(unregistered) transaction or unavailable in current version +tx_0022=Transaction data validation error +tx_0023=The transaction data is too big +tx_0024=Account is not exist +tx_0025=Transaction ledger verify fail +tx_0026=Orphan transaction +tx_0027=Repeated transaction +tx_0028=Remote response data not found +tx_0029=Transaction from cannot have contract address +tx_0030=Temporarily stop processing new transactions +tx_0031=Transaction broadcast failed +tx_0032=Send message failed +tx_0033=Invalid address +tx_0034=The minimum number of signatures for multi-signature account transactions is not reached +tx_0035=Multi-signed transaction's froms only have the same multi-signed address +tx_0036=Multi-sign account is not exist +tx_0037=Transaction verify failed +tx_0038=Contract transaction verify failed +tx_0039=The transaction was confirmed +tx_0040=System transactions cannot circulated directly through the network +tx_0041=System contract transactions cannot circulated directly through the network +tx_0042=Block Contains multiple unique transactions +tx_0043=Exist gas transactions without smart contract return transactions +tx_0044=Block address + diff --git a/module/nuls-cores/src/main/resources/ledger/FileEmpty.txt b/module/nuls-cores/src/main/resources/ledger/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/main/resources/module.json b/module/nuls-cores/src/main/resources/module.json new file mode 100644 index 0000000000..77825b7008 --- /dev/null +++ b/module/nuls-cores/src/main/resources/module.json @@ -0,0 +1,109 @@ +{ + "moduleCode": "nc", + "account": "----------------------------------------------------", + "chainId": 1, + "assetId": 1, + "mainChainId": 1, + "mainAssetId": 1, + "language": "en", + "encoding": "UTF-8", + "keystoreFolder": "/keystore/backup", + "dataPath":"/data", + "blackHolePublicKey":"000000000000000000000000000000000000000000000000000000000000000000", + "addressPrefix":"NULS", + "block": "----------------------------------------------------", + "forkChainsMonitorInterval": 10000, + "orphanChainsMonitorInterval": 10000, + "orphanChainsMaintainerInterval": 3000, + "storageSizeMonitorInterval": 180000, + "networkResetMonitorInterval": 300000, + "nodesMonitorInterval": 5000, + "txGroupRequestorInterval": 1000, + "txGroupTaskDelay": 3000, + "testAutoRollbackAmount": 0, + "rollbackHeight": 878000, + "blockMaxSize": 5242880, + "resetTime": 1800000, + "chainSwtichThreshold": 3, + "cacheSize": 1000, + "heightRange": 1000, + "maxRollback": 1000, + "consistencyNodePercent": 60, + "minNodeAmount": 1, + "downloadNumber": 10, + "extendMaxSize": 1024, + "validBlockInterval": 60000, + "smallBlockCache": 6, + "orphanChainMaxAge": 10, + "singleDownloadTimeout": 10000, + "waitNetworkInterval": 5000, + "cachedBlockSizeLimit": 20971520, + "genesisBlockPath": "", + "chain": "----------------------------------------------------", + "defaultDecimalPlaces": "8", + "chainNameMax": "20", + "assetSymbolMax": "8", + "assetNameMax": "20", + "assetDepositNuls": 1000, + "assetDepositNulsDestroyRate": "0.2", + "assetInitNumberMin": "100000000", + "assetInitNumberMax": "10000000000000", + "assetDecimalPlacesMin": "0", + "assetDecimalPlacesMax": "18", + "assetRecoveryRate": "0.9", + "chainName": "NULS", + "nulsAssetInitNumberMax": "100000000", + "mainSymbol": "NULS", + "nulsFeeMainNetRate": "0.6", + "chainAssetsTaskIntervalMinute": 600, + "consensus": "----------------------------------------------------", + "packingInterval": 10, + "inflationAmount": 18000000000, + "redPublishLockTime": 5184000, + "stopAgentLockTime": 259200, + "commissionRateMin": 10, + "commissionRateMax": 100, + "depositMin": 2000000000000, + "depositMax": 20000000000000, + "commissionMin": 20000000000000, + "commissionMax": 50000000000000, + "entrusterDepositMin": 200000000000, + "blockReward": 0, + "maxAgentCountOfAddress": "1", + "mainChainCommissionRatio": 60, + "contract": "----------------------------------------------------", + "maxViewGas": 100000000, + "packageLogPackages": "io.nuls.contract.vm.program.impl.ProgramExecutorImpl,db,rlp,general", + "packageLogLevels": "INFO,INFO,INFO,INFO", + "crosschain": "----------------------------------------------------", + "maxOutAmount":20, + "maxInAmount":200, + "crossCtxType":10, + "mainNet":false, + "ledger": "----------------------------------------------------", + "unconfirmedTxExpired": 600, + "assetRegDestroyAmount": 200, + "network": "----------------------------------------------------", + "port": 18001, + "maxInCount": 300, + "maxOutCount": 20, + "packetMagic": 3136151, + "selfSeedIps": "192.168.1.57:8888", + "crossPort": 18002, + "crossMaxInCount": 300, + "crossMaxOutCount": 10, + "moonSeedIps": "192.168.1.192:8088", + "timeServers":"africa.pool.ntp.org,antarctica.pool.ntp.org,asia.pool.ntp.org,europe.pool.ntp.org,north-america.pool.ntp.org,oceania.pool.ntp.org,south-america.pool.ntp.org,ntp.aliyun.com,time.windows.com,time.apple.com,time.asia.apple.com,time.euro.apple.com,time.cloudflare.com,time.google.com", + "protocol": "----------------------------------------------------", + "interval": 10, + "effectiveRatioMinimum": 60, + "continuousIntervalCountMinimum": 10, + "transaction": "----------------------------------------------------", + "unconfirmedTxExpire":600, + "txMaxSize":307200, + "moduleVerifyPercent":30, + "packageRpcReserveTime":100, + "txUnverifiedQueueSize":100000, + "orphanTtl":600, + "accountBlockManagerPublicKeys": "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad,029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020,02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb,020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8,02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195" +} \ No newline at end of file diff --git a/module/nuls-cores/src/main/resources/network/FileEmpty.txt b/module/nuls-cores/src/main/resources/network/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/main/resources/protocol-config.json b/module/nuls-cores/src/main/resources/protocol-config.json new file mode 100644 index 0000000000..b0547f5b1e --- /dev/null +++ b/module/nuls-cores/src/main/resources/protocol-config.json @@ -0,0 +1,802 @@ +[ + { + "version": "16", + "extend": "15", + "validTxs": [ + { + "type": "15", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CreateContractProcessorV16" + }, + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessorV16" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "15", + "extend": "14", + "validTxs": [ + { + "type": "27", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AssetRegTransferProcessorV15" + }, + { + "type": "11", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "RegChainTxProcessorV15" + }, + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV15" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "14", + "extend": "13", + "validTxs": [ + { + "type": "15", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CreateContractProcessorV14" + }, + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessorV14" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "13", + "extend": "12", + "validTxs": [ + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessorV13" + }, + { + "type": "34", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "DelayStopAgentProcessorV1" + }, + { + "type": "65", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountForTransferOnContractCallProcessorV13" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + + { + "version": "12", + "extend": "11", + "validTxs": [ + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV12" + }, + { + "type": "63", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountLockProcessorV12" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + + { + "version": "11", + "extend": "10", + "validTxs": [ + { + "type": "63", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountLockProcessorV11" + }, + { + "type": "64", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AccountUnlockProcessorV11" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "10", + "extend": "8", + "validTxs": [ + { + "type": "62", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "ResetChainInfoTxProcessor" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "8", + "extend": "7", + "validTxs": [ + { + "type": "15", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CreateContractProcessorV8" + }, + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessorV8" + }, + { + "type": "17", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "DeleteContractProcessorV8" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "7", + "extend": "6", + "validTxs": [ + { + "type": "11", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "RegChainTxProcessorV7" + }, + { + "type": "12", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": true, + "handler": "DestroyChainTxProcessorV7" + }, + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV7" + }, + { + "type": "14", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": true, + "handler": "DisableAssetTxProcessorV7" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "6", + "extend": "5", + "validTxs": [ + { + "type": "27", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AssetRegTransferProcessorV5" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "5", + "extend": "4", + "validTxs": [ + { + "type": "11", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "RegChainTxProcessorV5" + }, + { + "type": "12", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": true, + "handler": "DestroyChainTxProcessorV5" + }, + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV5" + }, + { + "type": "14", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": true, + "handler": "DisableAssetTxProcessorV5" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "4", + "extend": "3", + "validTxs": [ + { + "type": "19", + "systemTx": true, + "unlockTx": false, + "verifyFee": true, + "verifySignature": false, + "handler": "ContractReturnGasProcessor" + }, + { + "type": "4", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "CreateAgentProcessorV4" + }, + { + "type": "5", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "DepositProcessorV4" + }, + { + "type": "6", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "WithdrawProcessorV4" + }, + { + "type": "8", + "systemTx": true, + "unlockTx": true, + "verifySignature": false, + "verifyFee": false, + "handler": "RedPunishProcessorV4" + }, + { + "type": "9", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "StopAgentProcessorV4" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + + { + "version": "3", + "extend": "2", + "validTxs": [ + { + "type": "4", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "CreateAgentProcessorV3" + }, + { + "type": "5", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "DepositProcessorV3" + }, + { + "type": "6", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "WithdrawProcessorV3" + }, + { + "type": "9", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "StopAgentProcessorV3" + }, + { + "type": "21", + "systemTx": true, + "unlockTx": false, + "verifySignature": false, + "handler": "ContractDepositProcessorV3" + }, + { + "type": "23", + "systemTx": true, + "unlockTx": true, + "verifySignature": false, + "handler": "ContractStopAgentProcessorV2" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + + { + "version": "2", + "extend": "1", + "validTxs": [ + { + "type": "5", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "DepositProcessorV2" + }, + { + "type": "21", + "systemTx": true, + "unlockTx": false, + "verifySignature": false, + "handler": "ContractDepositProcessorV2" + }, + { + "type": "9", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "StopAgentProcessorV2" + }, + { + "type": "23", + "systemTx": true, + "unlockTx": true, + "verifySignature": false, + "handler": "ContractStopAgentProcessorV2" + } + ], + "validMsgs": [], + "invalidTxs": "", + "invalidMsgs": "" + }, + { + "version": "1", + "extend": "", + "validTxs": [ + { + "type": "10", + "systemTx": false, + "unlockTx": false, + "verifySignature": false, + "verifyFee": true, + "handler": "CrossChainProcessorV1" + }, + { + "type": "24", + "systemTx": false, + "unlockTx": false, + "verifySignature": false, + "verifyFee": true, + "handler": "VerifierChangeProcessorV1" + }, + { + "type": "25", + "systemTx": false, + "unlockTx": false, + "verifySignature": false, + "verifyFee": true, + "handler": "VerifierInitProcessorV1" + }, + { + "type": "26", + "systemTx": false, + "unlockTx": false, + "verifySignature": false, + "verifyFee": true, + "handler": "ContractCrossChainProcessorV1" + }, + { + "type": "60", + "systemTx": false, + "unlockTx": false, + "verifySignature": false, + "verifyFee": true, + "handler": "RegisteredChainChangeProcessorV1" + }, + { + "type": "61", + "systemTx": false, + "unlockTx": false, + "verifySignature": false, + "verifyFee": true, + "handler": "ResetLocalVerifierProcessorV1" + }, + { + "type": "15", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CreateContractProcessor" + }, + { + "type": "16", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "CallContractProcessor" + }, + { + "type": "17", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "DeleteContractProcessor" + }, + { + "type": "18", + "systemTx": true, + "unlockTx": false, + "verifyFee": true, + "verifySignature": false, + "handler": "" + }, + { + "type": "19", + "systemTx": true, + "unlockTx": false, + "verifyFee": true, + "verifySignature": false, + "handler": "" + }, + { + "type": "2", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "TransferProcessorV1" + }, + { + "type": "3", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AliasProcessorV1" + }, + { + "type": "11", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "RegChainTxProcessorV1" + }, + { + "type": "12", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": true, + "handler": "DestroyChainTxProcessorV1" + }, + { + "type": "13", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": true, + "handler": "AddAssetTxProcessorV1" + }, + { + "type": "14", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": true, + "handler": "DisableAssetTxProcessorV1" + }, + { + "type": "1", + "systemTx": true, + "unlockTx": false, + "verifySignature": false, + "verifyFee": false, + "handler": "CoinBaseProcessorV1" + }, + { + "type": "4", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "CreateAgentProcessorV1" + }, + { + "type": "5", + "systemTx": false, + "unlockTx": false, + "verifySignature": true, + "verifyFee": false, + "handler": "DepositProcessorV1" + }, + { + "type": "6", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "WithdrawProcessorV1" + }, + { + "type": "7", + "systemTx": true, + "unlockTx": false, + "verifySignature": false, + "verifyFee": false, + "handler": "YellowPunishProcessorV1" + }, + { + "type": "8", + "systemTx": true, + "unlockTx": true, + "verifySignature": false, + "verifyFee": false, + "handler": "RedPunishProcessorV1" + }, + { + "type": "9", + "systemTx": false, + "unlockTx": true, + "verifySignature": true, + "verifyFee": false, + "handler": "StopAgentProcessorV1" + }, + { + "type": "20", + "systemTx": true, + "unlockTx": false, + "verifySignature": false, + "handler": "ContractCreateAgentProcessorV1" + }, + { + "type": "21", + "systemTx": true, + "unlockTx": false, + "verifySignature": false, + "handler": "ContractDepositProcessorV1" + }, + { + "type": "22", + "systemTx": true, + "unlockTx": true, + "verifySignature": false, + "handler": "ContractWithdrawProcessorV1" + }, + { + "type": "23", + "systemTx": true, + "unlockTx": true, + "verifySignature": false, + "handler": "ContractStopAgentProcessorV1" + } + ], + "validMsgs": [ + { + "name": "io.nuls.transaction.message.ForwardTxMessage", + "protocolCmd": "newHash", + "handlers": "ForwardTxMessageHandlerV1" + }, + { + "name": "io.nuls.transaction.message.GetTxMessage", + "protocolCmd": "askTx", + "handlers": "GetTxMessageHandlerV1" + }, + { + "name": "io.nuls.transaction.message.BroadcastTxMessage", + "protocolCmd": "receiveTx", + "handlers": "BroadcastTxMessageHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.BroadCtxHashMessage", + "protocolCmd": "recvCtxHash", + "handlers": "BroadCtxHashHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.BroadCtxSignMessage", + "protocolCmd": "recvCtxSign", + "handlers": "BroadCtxSignHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.CirculationMessage", + "protocolCmd": "recvCirculat", + "handlers": "CirculationHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.CtxStateMessage", + "protocolCmd": "recvCtxState", + "handlers": "CtxStateHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.GetCirculationMessage", + "protocolCmd": "getCirculat", + "handlers": "GetCirculationHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.GetCtxStateMessage", + "protocolCmd": "getCtxState", + "handlers": "GetCtxStateHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.GetOtherCtxMessage", + "protocolCmd": "getOtherCtx", + "handlers": "GetOtherCtxHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.NewOtherCtxMessage", + "protocolCmd": "recvOtherCtx", + "handlers": "NewOtherCtxHandlerV1" + }, + { + "name": "io.nuls.crosschain.base.message.CrossTxRehandleMessage", + "protocolCmd": "ctxRehandle", + "handlers": "CrossTxRehandleMsgHandlerV1" + }, + { + "name": "io.nuls.block.message.BlockMessage", + "protocolCmd": "block", + "handlers": "BlockHandlerV1" + }, + { + "name": "io.nuls.block.message.CompleteMessage", + "protocolCmd": "complete", + "handlers": "CompleteHandlerV1" + }, + { + "name": "io.nuls.block.message.HashListMessage", + "protocolCmd": "getTxs", + "handlers": "GetTxGroupHandlerV1" + }, + { + "name": "io.nuls.block.message.HashMessage", + "protocolCmd": "getBlock,forward,getsBlock", + "handlers": "ForwardSmallBlockHandlerV1,GetBlockHandlerV1,GetSmallBlockHandlerV1" + }, + { + "name": "io.nuls.block.message.HeightRangeMessage", + "protocolCmd": "getBlocks", + "handlers": "GetBlocksHandlerV1" + }, + { + "name": "io.nuls.block.message.HeightMessage", + "protocolCmd": "getBlockH", + "handlers": "GetBlockByHeightHandlerV1" + }, + { + "name": "io.nuls.block.message.SmallBlockMessage", + "protocolCmd": "sBlock", + "handlers": "SmallBlockHandlerV1" + }, + { + "name": "io.nuls.block.message.TxGroupMessage", + "protocolCmd": "txs", + "handlers": "TxGroupHandlerV1" + } + ], + "invalidTxs": "", + "invalidMsgs": "" + } +] \ No newline at end of file diff --git a/module/nuls-protocol-update/src/main/resources/versions.json b/module/nuls-cores/src/main/resources/protocol/versions.json similarity index 100% rename from module/nuls-protocol-update/src/main/resources/versions.json rename to module/nuls-cores/src/main/resources/protocol/versions.json diff --git a/module/nuls-cores/src/main/resources/transaction/FileEmpty.txt b/module/nuls-cores/src/main/resources/transaction/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-account/src/test/java/io/nuls/account/ServiceInitializer.java b/module/nuls-cores/src/test/java/io/nuls/account/ServiceInitializer.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/ServiceInitializer.java rename to module/nuls-cores/src/test/java/io/nuls/account/ServiceInitializer.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/WsKernel.java b/module/nuls-cores/src/test/java/io/nuls/account/WsKernel.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/WsKernel.java rename to module/nuls-cores/src/test/java/io/nuls/account/WsKernel.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/AccountCmdTest.java b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/AccountCmdTest.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/AccountCmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/AccountCmdTest.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java similarity index 97% rename from module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java index 743165f30f..7a7982ab9f 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/AliasCmdTest.java @@ -1,12 +1,12 @@ package io.nuls.account.rpc.cmd; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.model.bo.tx.txdata.Alias; import io.nuls.account.rpc.call.LedgerCall; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.Transaction; +import io.nuls.common.ConfigBean; import io.nuls.core.constant.TxType; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.info.NoUse; @@ -115,7 +115,11 @@ public Response aliasTxCommit(Map params) throws Exception { @Test public void setAliasTest() throws Exception { Chain chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); //create an account for test //String address = createAnAccount(); String address="tNULSeBaMvEtDfvZuukDf2mVyfGo3DdiN8KLRG"; diff --git a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java similarity index 96% rename from module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java index 13b8de6c90..b18f7c1d4b 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/MultiSigAccountCmdTest.java @@ -3,11 +3,11 @@ import io.nuls.account.ServiceInitializer; import io.nuls.account.model.bo.Account; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.service.AccountService; import io.nuls.account.service.MultiSignAccountService; import io.nuls.base.data.Address; import io.nuls.base.data.MultiSigAccount; +import io.nuls.common.ConfigBean; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.crypto.HexUtil; import io.nuls.core.rpc.info.Constants; @@ -164,7 +164,11 @@ public MultiSigAccount createMultiSigAccount() throws Exception { * */ public List createAccount(int count) { chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); List accountList = accountService.createAccount(chain, count, password); assertNotNull(accountList); return accountList; diff --git a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/TestAddress.java b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/TestAddress.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/TestAddress.java rename to module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/TestAddress.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java similarity index 98% rename from module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java index 483814bc58..d3b36b25ee 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/rpc/cmd/TransactionCmdTest.java @@ -2,13 +2,13 @@ import io.nuls.account.constant.RpcConstant; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.model.dto.TransferDTO; import io.nuls.account.rpc.call.LedgerCall; import io.nuls.account.rpc.common.CommonRpcOperation; import io.nuls.account.util.TxUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.*; +import io.nuls.common.ConfigBean; import io.nuls.core.crypto.HexUtil; import io.nuls.core.log.Log; import io.nuls.core.parse.JSONUtils; @@ -63,7 +63,11 @@ public void start() throws Exception { NoUse.mockModule(); importKeyStore(); chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } diff --git a/module/nuls-account/src/test/java/io/nuls/account/rpc/common/CommonRpcOperation.java b/module/nuls-cores/src/test/java/io/nuls/account/rpc/common/CommonRpcOperation.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/rpc/common/CommonRpcOperation.java rename to module/nuls-cores/src/test/java/io/nuls/account/rpc/common/CommonRpcOperation.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java similarity index 92% rename from module/nuls-account/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java index 9fcccb977a..165380f0dc 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/service/AccountKeyStoreServiceTest.java @@ -4,7 +4,7 @@ import io.nuls.account.config.NulsConfig; import io.nuls.account.model.bo.Account; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; +import io.nuls.common.ConfigBean; import io.nuls.core.core.inteceptor.ModularServiceMethodInterceptor; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.rockdb.service.RocksDBService; @@ -47,7 +47,11 @@ public static void beforeTest() { public void backupAccountToKeyStoreTest() { //Create password accounts Chain chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); List accountList = accountService.createAccount(chain, 1, password); String address = accountList.get(0).getAddress().getBase58(); //测试不指定备份路径 diff --git a/module/nuls-account/src/test/java/io/nuls/account/service/AccountServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/account/service/AccountServiceTest.java similarity index 94% rename from module/nuls-account/src/test/java/io/nuls/account/service/AccountServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/service/AccountServiceTest.java index 37843af886..3016e6ef83 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/service/AccountServiceTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/service/AccountServiceTest.java @@ -4,7 +4,6 @@ import io.nuls.account.constant.AccountErrorCode; import io.nuls.account.model.bo.Account; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.model.bo.tx.AliasTransaction; import io.nuls.account.model.bo.tx.txdata.Alias; import io.nuls.base.basic.AddressTool; @@ -12,6 +11,7 @@ import io.nuls.base.data.CoinTo; import io.nuls.base.data.NulsHash; import io.nuls.base.signture.P2PHKSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.core.inteceptor.ModularServiceMethodInterceptor; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.crypto.HexUtil; @@ -52,7 +52,11 @@ public static void beforeTest() { // 启动时间同步线程 TimeService.getInstance().start(); accountService = SpringLiteContext.getBean(AccountService.class); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } @@ -78,7 +82,11 @@ public void createAccountTest() throws Exception { // } try { //Test the largest number of generated accounts. - chain.setConfig(new ConfigBean(assetId, 5)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(5); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); List accountList = accountService.createAccount(chain, 6, password); for(Account acc : accountList){ System.out.println(acc.getAddress().getBase58()); @@ -100,7 +108,11 @@ public void createAccountTest() throws Exception { public void setPasswordTest() { // create account Chain chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); List result = accountService.createAccount(chain, 1, null); assertTrue(result != null && result.size() == 1); Account account = result.get(0); diff --git a/module/nuls-account/src/test/java/io/nuls/account/service/AliasServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/account/service/AliasServiceTest.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/service/AliasServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/service/AliasServiceTest.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/storage/AccountStorageServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/account/storage/AccountStorageServiceTest.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/storage/AccountStorageServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/storage/AccountStorageServiceTest.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java similarity index 94% rename from module/nuls-account/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java index 518b878058..c5677c72b8 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/storage/AliasStorageServiceTest.java @@ -4,11 +4,11 @@ import io.nuls.account.config.NulsConfig; import io.nuls.account.model.bo.Account; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.model.bo.tx.txdata.Alias; import io.nuls.account.model.po.AliasPO; import io.nuls.account.service.AccountService; import io.nuls.base.basic.AddressTool; +import io.nuls.common.ConfigBean; import io.nuls.core.core.inteceptor.ModularServiceMethodInterceptor; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.rockdb.service.RocksDBService; @@ -120,7 +120,11 @@ public static Alias createAlias(){ accountService = SpringLiteContext.getBean(AccountService.class); } Chain chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); List accounts = accountService.createAccount(chain,1,null); String aliasStr = "Hi,我的别名是" + System.currentTimeMillis(); Alias alias = new Alias(); diff --git a/module/nuls-account/src/test/java/io/nuls/account/tx/CreateTx.java b/module/nuls-cores/src/test/java/io/nuls/account/tx/CreateTx.java similarity index 99% rename from module/nuls-account/src/test/java/io/nuls/account/tx/CreateTx.java rename to module/nuls-cores/src/test/java/io/nuls/account/tx/CreateTx.java index 3f83dcf983..6ad7513171 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/tx/CreateTx.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/tx/CreateTx.java @@ -25,7 +25,6 @@ package io.nuls.account.tx; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.model.dto.CoinDTO; import io.nuls.account.util.TxUtil; import io.nuls.base.basic.AddressTool; @@ -33,6 +32,7 @@ import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.SignatureUtil; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; diff --git a/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java b/module/nuls-cores/src/test/java/io/nuls/account/tx/Transfer.java similarity index 99% rename from module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java rename to module/nuls-cores/src/test/java/io/nuls/account/tx/Transfer.java index 2e161ad1a5..c8a4d28ab0 100644 --- a/module/nuls-account/src/test/java/io/nuls/account/tx/Transfer.java +++ b/module/nuls-cores/src/test/java/io/nuls/account/tx/Transfer.java @@ -28,7 +28,6 @@ import io.nuls.account.constant.RpcConstant; import io.nuls.account.model.bo.Account; import io.nuls.account.model.bo.Chain; -import io.nuls.account.model.bo.config.ConfigBean; import io.nuls.account.model.bo.tx.AccountBlockExtend; import io.nuls.account.model.bo.tx.AccountBlockInfo; import io.nuls.account.model.bo.tx.txdata.AccountBlockData; @@ -44,6 +43,7 @@ import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.SignatureUtil; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.constant.TxType; import io.nuls.core.crypto.ECKey; import io.nuls.core.crypto.HexUtil; @@ -53,8 +53,6 @@ import io.nuls.core.parse.I18nUtils; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.info.Constants; -import io.nuls.core.rpc.info.HostInfo; -import io.nuls.core.rpc.info.NoUse; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; diff --git a/module/nuls-account/src/test/java/io/nuls/account/tx/TxTest.java b/module/nuls-cores/src/test/java/io/nuls/account/tx/TxTest.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/tx/TxTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/tx/TxTest.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/util/AddressToolTest.java b/module/nuls-cores/src/test/java/io/nuls/account/util/AddressToolTest.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/util/AddressToolTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/util/AddressToolTest.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/util/AddressV1ToV2Test.java b/module/nuls-cores/src/test/java/io/nuls/account/util/AddressV1ToV2Test.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/util/AddressV1ToV2Test.java rename to module/nuls-cores/src/test/java/io/nuls/account/util/AddressV1ToV2Test.java diff --git a/module/nuls-account/src/test/java/io/nuls/account/util/PreconditionsTest.java b/module/nuls-cores/src/test/java/io/nuls/account/util/PreconditionsTest.java similarity index 100% rename from module/nuls-account/src/test/java/io/nuls/account/util/PreconditionsTest.java rename to module/nuls-cores/src/test/java/io/nuls/account/util/PreconditionsTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/BlockGeneratorTest.java b/module/nuls-cores/src/test/java/io/nuls/block/BlockGeneratorTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/BlockGeneratorTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/BlockGeneratorTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/CommonTest.java b/module/nuls-cores/src/test/java/io/nuls/block/CommonTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/CommonTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/CommonTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/config/GenesisBlockTest.java b/module/nuls-cores/src/test/java/io/nuls/block/config/GenesisBlockTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/config/GenesisBlockTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/config/GenesisBlockTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/manager/BlockChainManagerTest.java b/module/nuls-cores/src/test/java/io/nuls/block/manager/BlockChainManagerTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/manager/BlockChainManagerTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/manager/BlockChainManagerTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/message/BlockMessageTest.java b/module/nuls-cores/src/test/java/io/nuls/block/message/BlockMessageTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/message/BlockMessageTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/message/BlockMessageTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/message/MessageHandlerTest.java b/module/nuls-cores/src/test/java/io/nuls/block/message/MessageHandlerTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/message/MessageHandlerTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/message/MessageHandlerTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/message/MessageTest.java b/module/nuls-cores/src/test/java/io/nuls/block/message/MessageTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/message/MessageTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/message/MessageTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/message/handler/SmallBlockHandlerTest.java b/module/nuls-cores/src/test/java/io/nuls/block/message/handler/SmallBlockHandlerTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/message/handler/SmallBlockHandlerTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/message/handler/SmallBlockHandlerTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/model/ChainTest.java b/module/nuls-cores/src/test/java/io/nuls/block/model/ChainTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/model/ChainTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/model/ChainTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/rpc/BlockResourceTest.java b/module/nuls-cores/src/test/java/io/nuls/block/rpc/BlockResourceTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/rpc/BlockResourceTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/rpc/BlockResourceTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/service/impl/ChainStorageServiceImplTest.java b/module/nuls-cores/src/test/java/io/nuls/block/service/impl/ChainStorageServiceImplTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/service/impl/ChainStorageServiceImplTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/service/impl/ChainStorageServiceImplTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/storage/BlockStorageServiceImplTest.java b/module/nuls-cores/src/test/java/io/nuls/block/storage/BlockStorageServiceImplTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/storage/BlockStorageServiceImplTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/storage/BlockStorageServiceImplTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/thread/BlockDownloaderTest.java b/module/nuls-cores/src/test/java/io/nuls/block/thread/BlockDownloaderTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/thread/BlockDownloaderTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/thread/BlockDownloaderTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/thread/BlockSynchronizerTest.java b/module/nuls-cores/src/test/java/io/nuls/block/thread/BlockSynchronizerTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/thread/BlockSynchronizerTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/thread/BlockSynchronizerTest.java diff --git a/module/nuls-block/src/test/java/io/nuls/block/thread/monitor/ForkChainsMonitorTest.java b/module/nuls-cores/src/test/java/io/nuls/block/thread/monitor/ForkChainsMonitorTest.java similarity index 100% rename from module/nuls-block/src/test/java/io/nuls/block/thread/monitor/ForkChainsMonitorTest.java rename to module/nuls-cores/src/test/java/io/nuls/block/thread/monitor/ForkChainsMonitorTest.java diff --git a/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/AssetCmdTest.java b/module/nuls-cores/src/test/java/io/nuls/chain/test/AssetCmdTest.java similarity index 100% rename from module/nuls-chain-manager/src/test/java/io/nuls/chain/test/AssetCmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/chain/test/AssetCmdTest.java diff --git a/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/ChainCmdTest.java b/module/nuls-cores/src/test/java/io/nuls/chain/test/ChainCmdTest.java similarity index 100% rename from module/nuls-chain-manager/src/test/java/io/nuls/chain/test/ChainCmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/chain/test/ChainCmdTest.java diff --git a/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java b/module/nuls-cores/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java similarity index 100% rename from module/nuls-chain-manager/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/chain/test/RegCrossChainTxTest.java diff --git a/module/nuls-chain-manager/src/test/java/io/nuls/chain/test/StorageTest.java b/module/nuls-cores/src/test/java/io/nuls/chain/test/StorageTest.java similarity index 100% rename from module/nuls-chain-manager/src/test/java/io/nuls/chain/test/StorageTest.java rename to module/nuls-cores/src/test/java/io/nuls/chain/test/StorageTest.java diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/CallOtherModule.java b/module/nuls-cores/src/test/java/io/nuls/consensus/CallOtherModule.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/CallOtherModule.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/CallOtherModule.java index 33a6a804d0..ae8fde7ea1 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/CallOtherModule.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/CallOtherModule.java @@ -1,4 +1,4 @@ -package io.nuls.test; +package io.nuls.consensus; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.info.NoUse; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/CmdPriorityTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/CmdPriorityTest.java similarity index 98% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/CmdPriorityTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/CmdPriorityTest.java index 408583be3c..e273996183 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/CmdPriorityTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/CmdPriorityTest.java @@ -1,4 +1,4 @@ -package io.nuls.test; +package io.nuls.consensus; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.info.NoUse; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/TestUtil.java b/module/nuls-cores/src/test/java/io/nuls/consensus/TestUtil.java similarity index 81% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/TestUtil.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/TestUtil.java index 4704409a55..1471979016 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/TestUtil.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/TestUtil.java @@ -1,10 +1,9 @@ -package io.nuls.test; +package io.nuls.consensus; import io.nuls.core.model.ObjectUtils; import io.nuls.core.rockdb.constant.DBErrorCode; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConfig; -import io.nuls.poc.constant.ConsensusConstant; +import io.nuls.consensus.constant.ConsensusConstant; import io.nuls.core.log.Log; public class TestUtil { @@ -33,7 +32,4 @@ public static void initTable(int chainId){ } } } - public static void main(String []args){ - byte [] objs=ObjectUtils.objectToBytes(new ConsensusConfig()); - } } diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/AgentTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/AgentTest.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/AgentTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/rpc/AgentTest.java index 51a86f0430..b96843064d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/AgentTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/AgentTest.java @@ -1,10 +1,11 @@ -package io.nuls.test.rpc; +package io.nuls.consensus.rpc; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; import io.nuls.base.basic.TransactionFeeCalculator; import io.nuls.base.data.*; import io.nuls.base.signture.P2PHKSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.constant.TxType; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.rpc.info.Constants; @@ -15,11 +16,10 @@ import io.nuls.core.crypto.HexUtil; import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.bo.tx.txdata.StopAgent; -import io.nuls.poc.rpc.call.CallMethodUtils; -import io.nuls.poc.utils.manager.CoinDataManager; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.StopAgent; +import io.nuls.consensus.rpc.call.CallMethodUtils; +import io.nuls.consensus.utils.manager.CoinDataManager; import org.junit.BeforeClass; import org.junit.Test; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/ConsensusTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/ConsensusTest.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/ConsensusTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/rpc/ConsensusTest.java index 12613660c9..5e31021512 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/ConsensusTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/ConsensusTest.java @@ -1,4 +1,4 @@ -package io.nuls.test.rpc; +package io.nuls.consensus.rpc; import io.nuls.base.RPCUtil; import io.nuls.base.data.Address; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/DepositTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/DepositTest.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/DepositTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/rpc/DepositTest.java index a80aabd896..6b4da9b872 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/DepositTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/DepositTest.java @@ -1,4 +1,4 @@ -package io.nuls.test.rpc; +package io.nuls.consensus.rpc; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; @@ -7,6 +7,7 @@ import io.nuls.base.data.CoinData; import io.nuls.base.data.Transaction; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.crypto.HexUtil; import io.nuls.core.parse.SerializeUtils; import io.nuls.core.rpc.info.Constants; @@ -14,10 +15,9 @@ import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; -import io.nuls.poc.model.bo.Chain; -import io.nuls.poc.model.bo.config.ConfigBean; -import io.nuls.poc.model.bo.tx.txdata.CancelDeposit; -import io.nuls.poc.rpc.call.CallMethodUtils; +import io.nuls.consensus.model.bo.Chain; +import io.nuls.consensus.model.bo.tx.txdata.CancelDeposit; +import io.nuls.consensus.rpc.call.CallMethodUtils; import org.junit.BeforeClass; import org.junit.Test; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/WsKernel.java b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/WsKernel.java similarity index 97% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/WsKernel.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/rpc/WsKernel.java index 124d8668e2..3636d16f5d 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/rpc/WsKernel.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/rpc/WsKernel.java @@ -25,7 +25,7 @@ * */ -package io.nuls.test.rpc; +package io.nuls.consensus.rpc; import io.nuls.core.rpc.info.NoUse; import org.junit.Test; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentDBOperator.java b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/AgentDBOperator.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentDBOperator.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/storage/AgentDBOperator.java index da9353a369..b1a6121873 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentDBOperator.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/AgentDBOperator.java @@ -1,10 +1,10 @@ -package io.nuls.test.storage; +package io.nuls.consensus.storage; import com.fasterxml.jackson.core.JsonProcessingException; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.model.po.AgentPo; +import io.nuls.consensus.model.po.AgentPo; import java.io.IOException; import java.util.HashMap; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentStorageTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/AgentStorageTest.java similarity index 93% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentStorageTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/storage/AgentStorageTest.java index c36d5aedf2..70373790d4 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/AgentStorageTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/AgentStorageTest.java @@ -1,11 +1,10 @@ -package io.nuls.test.storage; +package io.nuls.consensus.storage; import io.nuls.base.data.NulsHash; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.storage.AgentStorageService; -import io.nuls.test.TestUtil; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.AgentPo; +import io.nuls.consensus.TestUtil; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; import io.nuls.core.parse.ConfigLoader; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/DepositStorageTest.java similarity index 88% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/storage/DepositStorageTest.java index 939d0536a3..2d06762dab 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/DepositStorageTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/DepositStorageTest.java @@ -1,24 +1,15 @@ -package io.nuls.test.storage; +package io.nuls.consensus.storage; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.NulsHash; import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.AgentPo; -import io.nuls.poc.model.po.DepositPo; -import io.nuls.poc.storage.DepositStorageService; -import io.nuls.test.TestUtil; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.log.Log; -import io.nuls.core.parse.ConfigLoader; -import org.junit.Before; +import io.nuls.consensus.model.po.DepositPo; import org.junit.Test; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import java.util.Properties; import static org.junit.Assert.assertNotNull; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/PunishStorageTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/PunishStorageTest.java similarity index 87% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/PunishStorageTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/storage/PunishStorageTest.java index b51014c3f6..075156f203 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/storage/PunishStorageTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/storage/PunishStorageTest.java @@ -1,13 +1,12 @@ -package io.nuls.test.storage; +package io.nuls.consensus.storage; import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.poc.constant.ConsensusConstant; -import io.nuls.poc.model.po.PunishLogPo; -import io.nuls.poc.storage.PunishStorageService; -import io.nuls.poc.utils.enumeration.PunishReasonEnum; -import io.nuls.poc.utils.enumeration.PunishType; +import io.nuls.consensus.constant.ConsensusConstant; +import io.nuls.consensus.model.po.PunishLogPo; +import io.nuls.consensus.utils.enumeration.PunishReasonEnum; +import io.nuls.consensus.utils.enumeration.PunishType; import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.test.TestUtil; +import io.nuls.consensus.TestUtil; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.log.Log; import io.nuls.core.parse.ConfigLoader; diff --git a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/utils/MerkleTest.java b/module/nuls-cores/src/test/java/io/nuls/consensus/utils/MerkleTest.java similarity index 99% rename from module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/utils/MerkleTest.java rename to module/nuls-cores/src/test/java/io/nuls/consensus/utils/MerkleTest.java index 3a225b4274..71eecf4496 100644 --- a/module/nuls-consensus/nuls-consensus-poc/src/test/java/io/nuls/test/utils/MerkleTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/consensus/utils/MerkleTest.java @@ -1,4 +1,4 @@ -package io.nuls.test.utils; +package io.nuls.consensus.utils; import io.nuls.base.data.NulsHash; import io.nuls.core.crypto.Sha256Hash; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/base/Base.java b/module/nuls-cores/src/test/java/io/nuls/contract/base/Base.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/base/Base.java rename to module/nuls-cores/src/test/java/io/nuls/contract/base/Base.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/AES256CBCTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/AES256CBCTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/AES256CBCTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/AES256CBCTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/ECIESFinalTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/ECIESFinalTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/ECIESFinalTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/ECIESFinalTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/HMacTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/HMacTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/HMacTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/HMacTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/Sha512Test.java b/module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/Sha512Test.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/Sha512Test.java rename to module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/Sha512Test.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/ShareSecretTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/ShareSecretTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/crypto/ecies/ShareSecretTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/crypto/ecies/ShareSecretTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/deserialization/TxDeserialization.java b/module/nuls-cores/src/test/java/io/nuls/contract/deserialization/TxDeserialization.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/deserialization/TxDeserialization.java rename to module/nuls-cores/src/test/java/io/nuls/contract/deserialization/TxDeserialization.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java similarity index 97% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java index 1d21f29df6..f44581b277 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/ContractTest.java @@ -26,19 +26,11 @@ import io.nuls.base.basic.AddressTool; -import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.config.ConfigBean; -import io.nuls.contract.util.Log; -import io.nuls.contract.util.VMContext; import io.nuls.contract.vm.natives.io.nuls.contract.sdk.NativeAddress; import io.nuls.contract.vm.program.*; -import io.nuls.contract.vm.program.impl.ProgramExecutorImpl; -import io.nuls.core.rockdb.service.RocksDBService; import io.nuls.core.crypto.HexUtil; import org.apache.commons.io.IOUtils; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import java.io.FileInputStream; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/MockBase.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/MockBase.java similarity index 97% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/MockBase.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/MockBase.java index b1699bd146..9ff9fbca88 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/MockBase.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/MockBase.java @@ -25,13 +25,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import io.nuls.base.protocol.ProtocolGroupManager; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.base.Base; -import io.nuls.contract.config.ContractConfig; import io.nuls.contract.config.ContractContext; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.manager.CmdRegisterManager; import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.util.BeanUtilTest; import io.nuls.contract.util.Log; import io.nuls.contract.util.VMContext; @@ -82,9 +82,9 @@ public void setUp() { configBean.setMaxViewGas(100000000L); chain.setConfig(configBean); - ContractConfig contractConfig = new ContractConfig(); + NulsCoresConfig contractConfig = new NulsCoresConfig(); contractConfig.setDataPath(dataPath); - SpringLiteContext.putBean(ContractConfig.class.getName(), contractConfig); + SpringLiteContext.putBean(NulsCoresConfig.class.getName(), contractConfig); vmContext = new VMContextMock(); programExecutor = new ProgramExecutorImpl(vmContext, chain); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java similarity index 99% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java index af7a7b6c75..6bed0222cb 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/basetest/VoteTest.java @@ -25,8 +25,8 @@ package io.nuls.contract.mock.basetest; +import io.nuls.common.ConfigBean; import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.util.Log; import io.nuls.contract.util.VMContext; import io.nuls.contract.util.VMContextMock; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/booltest/BooleanTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/booltest/BooleanTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/booltest/BooleanTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/booltest/BooleanTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/callable/ContractMergeContractTransferTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/callable/ContractMergeContractTransferTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/callable/ContractMergeContractTransferTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/callable/ContractMergeContractTransferTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java similarity index 99% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java index 8d0c738133..954b4484dc 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/consensus/ConsensusLocalTest.java @@ -24,12 +24,12 @@ package io.nuls.contract.mock.consensus; import com.fasterxml.jackson.core.JsonProcessingException; +import io.nuls.common.ConfigBean; import io.nuls.contract.mock.invokeexternalcmd.InvokeExternalCmdLocalTest; import io.nuls.contract.manager.ChainManager; import io.nuls.contract.manager.CmdRegisterManager; import io.nuls.contract.model.bo.Chain; import io.nuls.contract.model.bo.CmdRegister; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.util.BeanUtilTest; import io.nuls.contract.base.Base; import io.nuls.contract.util.Log; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/contractvm/ContractVmTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/contractvm/ContractVmTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/contractvm/ContractVmTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/contractvm/ContractVmTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/contractvm/ContractVmV8Test.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/contractvm/ContractVmV8Test.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/contractvm/ContractVmV8Test.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/contractvm/ContractVmV8Test.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/depth/DepthTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/depth/DepthTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/depth/DepthTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/depth/DepthTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/helper/ContractHelperMock.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/helper/ContractHelperMock.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/helper/ContractHelperMock.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/helper/ContractHelperMock.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/helper/ContractNewTxFromOtherModuleHandlerMock.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/helper/ContractNewTxFromOtherModuleHandlerMock.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/helper/ContractNewTxFromOtherModuleHandlerMock.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/helper/ContractNewTxFromOtherModuleHandlerMock.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java similarity index 99% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java index f6cca02a8c..58c2aa17fa 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/invokeexternalcmd/InvokeExternalCmdLocalTest.java @@ -27,6 +27,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import io.nuls.base.basic.AddressTool; +import io.nuls.common.ConfigBean; import io.nuls.contract.enums.CmdRegisterMode; import io.nuls.contract.enums.CmdRegisterReturnType; import io.nuls.contract.helper.ContractHelper; @@ -38,7 +39,6 @@ import io.nuls.contract.mock.helper.ContractNewTxFromOtherModuleHandlerMock; import io.nuls.contract.model.bo.Chain; import io.nuls.contract.model.bo.CmdRegister; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.util.*; import io.nuls.contract.vm.natives.io.nuls.contract.sdk.NativeAddress; import io.nuls.contract.vm.program.*; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/nrc721/NRC721Test.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/nrc721/NRC721Test.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/nrc721/NRC721Test.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/nrc721/NRC721Test.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java similarity index 99% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java index 65ec60942b..cfbe35ee55 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/pocm/ContractPOCMLocalTest.java @@ -24,6 +24,7 @@ package io.nuls.contract.mock.pocm; import com.fasterxml.jackson.core.JsonProcessingException; +import io.nuls.common.ConfigBean; import io.nuls.contract.base.Base; import io.nuls.contract.enums.CmdRegisterMode; import io.nuls.contract.enums.CmdRegisterReturnType; @@ -38,7 +39,6 @@ import io.nuls.contract.model.bo.Chain; import io.nuls.contract.model.bo.CmdRegister; import io.nuls.contract.model.bo.ContractBalance; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.model.dto.BlockHeaderDto; import io.nuls.contract.util.*; import io.nuls.contract.vm.natives.io.nuls.contract.sdk.NativeAddress; diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java similarity index 98% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java index 976a29a8e8..4a55b6f1a8 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/mock/storagestructure/LoadLargeContractTest.java @@ -25,11 +25,11 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.contract.config.ContractConfig; +import io.nuls.common.ConfigBean; +import io.nuls.common.NulsCoresConfig; import io.nuls.contract.config.ContractContext; import io.nuls.contract.constant.ContractDBConstant; import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.model.po.ContractAddressInfoPo; import io.nuls.contract.util.ContractDBUtil; import io.nuls.contract.util.Log; @@ -87,9 +87,9 @@ public void setUp() { configBean.setMaxViewGas(100000000L); chain.setConfig(configBean); - ContractConfig contractConfig = new ContractConfig(); + NulsCoresConfig contractConfig = new NulsCoresConfig(); contractConfig.setDataPath(dataPath); - SpringLiteContext.putBean(ContractConfig.class.getName(), contractConfig); + SpringLiteContext.putBean(NulsCoresConfig.class.getName(), contractConfig); vmContext = new VMContextMock(); programExecutor = new ProgramExecutorImpl(vmContext, chain); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/storagestructure/StorageStructureContract.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/storagestructure/StorageStructureContract.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/storagestructure/StorageStructureContract.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/storagestructure/StorageStructureContract.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/twodimensionaltest/TwoDimensionalTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/mock/twodimensionaltest/TwoDimensionalTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/mock/twodimensionaltest/TwoDimensionalTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/mock/twodimensionaltest/TwoDimensionalTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/randomseed/RandomSeedCallTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/randomseed/RandomSeedCallTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/randomseed/RandomSeedCallTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/randomseed/RandomSeedCallTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/serialize/ContractOfflineTxHashPoTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/serialize/ContractOfflineTxHashPoTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/serialize/ContractOfflineTxHashPoTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/serialize/ContractOfflineTxHashPoTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/serialize/TxSerialization.java b/module/nuls-cores/src/test/java/io/nuls/contract/serialize/TxSerialization.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/serialize/TxSerialization.java rename to module/nuls-cores/src/test/java/io/nuls/contract/serialize/TxSerialization.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/CoinDto.java b/module/nuls-cores/src/test/java/io/nuls/contract/testmodel/CoinDto.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/CoinDto.java rename to module/nuls-cores/src/test/java/io/nuls/contract/testmodel/CoinDto.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/CoinFromDto.java b/module/nuls-cores/src/test/java/io/nuls/contract/testmodel/CoinFromDto.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/CoinFromDto.java rename to module/nuls-cores/src/test/java/io/nuls/contract/testmodel/CoinFromDto.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/CoinToDto.java b/module/nuls-cores/src/test/java/io/nuls/contract/testmodel/CoinToDto.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/CoinToDto.java rename to module/nuls-cores/src/test/java/io/nuls/contract/testmodel/CoinToDto.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/TransactionDto.java b/module/nuls-cores/src/test/java/io/nuls/contract/testmodel/TransactionDto.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/testmodel/TransactionDto.java rename to module/nuls-cores/src/test/java/io/nuls/contract/testmodel/TransactionDto.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/base/BaseQuery.java similarity index 99% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/base/BaseQuery.java index 48a5cfc09a..47afef292b 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/base/BaseQuery.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/tx/base/BaseQuery.java @@ -35,9 +35,9 @@ import io.nuls.base.data.Block; import io.nuls.base.data.BlockHeader; import io.nuls.base.data.Transaction; +import io.nuls.common.ConfigBean; import io.nuls.contract.base.Base; import io.nuls.contract.model.bo.Chain; -import io.nuls.contract.model.bo.config.ConfigBean; import io.nuls.contract.model.dto.ContractTransactionDto; import io.nuls.contract.rpc.call.BlockCall; import io.nuls.contract.rpc.call.LedgerCall; @@ -229,7 +229,11 @@ public void before() throws Exception { ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); } chain = new Chain(); - chain.setConfig(new ConfigBean(assetId, chainId, 100000000L)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } protected void updateSyncKernel() {} diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/consensus/ConsensusSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/consensus/ConsensusSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/consensus/ConsensusSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/consensus/ConsensusSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/contractCreate/ContractCreateSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractQueryTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractQueryTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractQueryTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractQueryTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/contractcallcontract/ContractCallContractSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractvm/ContractVmSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/contractvm/ContractVmSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractvm/ContractVmSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/contractvm/ContractVmSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractvm/ContractVmV8SendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/contractvm/ContractVmV8SendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/contractvm/ContractVmV8SendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/contractvm/ContractVmV8SendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastBase.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/customizetx/ContractMakeAndBroadcastTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/multiSign/MultiSignTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/multyasset/ContractMultyAssetTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multytx/ContractMultyTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/multytx/ContractMultyTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/multytx/ContractMultyTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/multytx/ContractMultyTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenQueryTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java similarity index 97% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java index cd39d03fd0..f1775af170 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java @@ -62,7 +62,7 @@ public class ContractNRC20TokenSendTxTest extends BaseQuery { @Test public void createContract() throws Exception { //sender = toAddress32; - InputStream in = new FileInputStream(ContractTest.class.getResource("/nrc20-locked-token").getFile()); + InputStream in = new FileInputStream(ContractTest.class.getResource("/contract/nrc20-locked-token").getFile()); byte[] contractCode = IOUtils.toByteArray(in); String remark = "create contract test - 空气币"; String name = "NulsSwap"; @@ -92,10 +92,11 @@ public void callContract() throws Exception { if(StringUtils.isBlank(tokenReceiver)) { tokenReceiver = toAddress1; } + tokenReceiver = "tNULSeBaN5QRhYVp361kB9bvhvujN7QiBST4wf"; String methodDesc = ""; String remark = "call contract test - 空气币转账"; - String token = BigInteger.valueOf(800L).toString(); - Map params = this.makeCallParams(sender, value, "tNULSeBaMy3Tw7pHNDYwSMaewDypQMdNywXXUJ", methodName, methodDesc, remark, tokenReceiver, token); + String token = BigInteger.valueOf(200000000000000L).toString(); + Map params = this.makeCallParams(sender, value, "tNULSeBaN6fGF3hwSrQsHq7B2GhtQ1W1ZMT9Nx", methodName, methodDesc, remark, tokenReceiver, token); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CALL, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CALL)); assertTrue(cmdResp2, result); diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20cross/ContractNRC20CrossTokenSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20cross/ContractNRC20CrossTokenSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc20cross/ContractNRC20CrossTokenSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20cross/ContractNRC20CrossTokenSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc721/ContractNRC721TokenSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc721/ContractNRC721TokenSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/nrc721/ContractNRC721TokenSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc721/ContractNRC721TokenSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/offline/ContractMultyAssetOfflineTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/offline/ContractMultyAssetOfflineTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/offline/ContractMultyAssetOfflineTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/offline/ContractMultyAssetOfflineTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java similarity index 93% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java index 960bfa24cc..a190a8b038 100644 --- a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java @@ -70,10 +70,11 @@ public void createConsensusEnhancementContract() throws Exception { //BigInteger candySupply, //int lockedTokenDay, //BigInteger minimumStaking, + //BigInteger maximumStaking, //boolean openConsensus, //boolean openAwardConsensusNodeProvider, //String authorizationCode - Object[] args = new Object[]{"tNULSeBaMy3Tw7pHNDYwSMaewDypQMdNywXXUJ", 0, 0, 20000000, 200000000000000L, 1, 10000000000L, true, false, "qwerqwerasd"}; + Object[] args = new Object[]{"tNULSeBaN6fGF3hwSrQsHq7B2GhtQ1W1ZMT9Nx", 0, 0, 20000000, 200000000000000L, 1, 10000000000L, 10000000_0000_0000L, true, false, "qwerqwerasd"}; Map params = this.makeCreateParams(sender, contractCode, "pocm_new", remark, args); Response cmdResp2 = ResponseMessageProcessor.requestAndResponse(ModuleE.SC.abbr, CREATE, params); Map result = (HashMap) (((HashMap) cmdResp2.getResponseData()).get(CREATE)); @@ -135,8 +136,7 @@ public void stopAgent()throws Exception{ public void getAgentInfo()throws Exception{ Mapparams = new HashMap<>(); params.put(Constants.CHAIN_ID,2); - // c5f2c0d00cbca36c39912f9332e91ec3098aedc3e47c26e2135a2057949da989 - params.put("agentHash","07dece0a400508d749a5e4e5f7d821c3e2836cb4de78c5083897dbe1f4d9caf9"); + params.put("agentHash","60ae9570af85f4542c4a8a3851c489db4e7753f4f22d31824e16c8d21031e280"); Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_getAgentInfo", params); System.out.println(JSONUtils.obj2PrettyJson(cmdResp)); } @@ -149,8 +149,8 @@ public void depositAgent()throws Exception{ Map params = new HashMap<>(); params.put(Constants.CHAIN_ID,2); params.put("address",sender); - params.put("agentHash","4dce090750b1900c1e741b961b32e75ce9f9d9c69997388ec73e9dd62cb8c835"); - params.put("deposit","30000000000000"); + params.put("agentHash","60ae9570af85f4542c4a8a3851c489db4e7753f4f22d31824e16c8d21031e280"); + params.put("deposit", new BigDecimal("140000").movePointRight(8).toString()); params.put("password", "nuls123456"); Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_depositToAgent", params); System.out.println(cmdResp.getResponseData()); @@ -164,7 +164,7 @@ public void withdraw()throws Exception{ Mapparams = new HashMap<>(); params.put(Constants.CHAIN_ID,2); params.put("address", sender); - params.put("txHash","055f0a738da18818c6fed2b9ae29e5c300b4f327676f7a59aeaa7afdfaa264b2"); + params.put("txHash","22bd85e88c0bd13524946bd8fad03a8a4ff9d02be4870b7239f077820569090c"); params.put("password", "nuls123456"); Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.CS.abbr, "cs_withdraw", params); System.out.println(cmdResp.getResponseData()); @@ -188,10 +188,9 @@ public void testConsensusDepositOthersProcessor() throws Exception { this.invokeCall(sender, BigInteger.ZERO, contractAddress, "addOtherAgent", null, "remark", List.of("4dce090750b1900c1e741b961b32e75ce9f9d9c69997388ec73e9dd62cb8c835").toArray()); Log.info("begin depositForOwn {}", sender);*/ - String nrc20Locked = "tNULSeBaN2raFV6Z31pTy5oFc2yNL9gQhwnv6a"; + String nrc20Locked = "tNULSeBaN6fGF3hwSrQsHq7B2GhtQ1W1ZMT9Nx"; contractAddress_nrc20 = nrc20Locked; - contractAddress = "tNULSeBaNAEiicCEsWR3f4HoZdhtWkVXdWqvpa"; - String pocm = contractAddress; + String pocm = "tNULSeBaN9gTYbwYwFGj8D74U8VVYuUxfKwsT1"; //this.invokeCall(sender, BigInteger.ZERO, contractAddress, "removeAgent", null, "remark", List.of("4dce090750b1900c1e741b961b32e75ce9f9d9c69997388ec73e9dd62cb8c835").toArray()); //this.invokeCall(sender, BigInteger.ZERO, contractAddress, "addOtherAgent", null, "remark", List.of("4dce090750b1900c1e741b961b32e75ce9f9d9c69997388ec73e9dd62cb8c835").toArray()); @@ -202,7 +201,7 @@ public void testConsensusDepositOthersProcessor() throws Exception { //Log.info("begin quit {}", toAddress6); //this.invokeCall(toAddress6, BigInteger.ZERO, contractAddress, "quit", null, "remark", "0"); // - this.invokeCall(sender, BigInteger.valueOf(150000_00000000L), contractAddress, "depositForOwn", null, "remark"); + this.invokeCall(sender, BigInteger.valueOf(150000_00000000L), pocm, "depositForOwn", null, "remark"); //Log.info("begin depositForOwn {}", toAddress5); //this.invokeCall(toAddress5, BigInteger.valueOf(2100_00000000L), contractAddress, "depositForOwn", null, "remark"); //Log.info("begin depositForOwn {}", toAddress6); @@ -390,12 +389,12 @@ public void createAgentByOwner() throws Exception { * 调用合约 */ @Test - public void call() throws Exception { + public void addOtherAgent() throws Exception { BigInteger value = BigInteger.ZERO; String methodName = "addOtherAgent"; String methodDesc = ""; String remark = "remark"; - Object[] args = new Object[]{"25326fc2d8ff22ec869baf8c4d55012dfa7f9860c0d1c54dc8569925d15f7e5f"}; + Object[] args = new Object[]{"60ae9570af85f4542c4a8a3851c489db4e7753f4f22d31824e16c8d21031e280"}; this.invokeCall(sender, value, contractAddress, methodName, methodDesc, remark, args); } @@ -404,11 +403,11 @@ public void call() throws Exception { */ @Test public void depositForOwn() throws Exception { - BigInteger value = BigInteger.valueOf(3000_00000000L); + BigInteger value = BigInteger.valueOf(30001_00000000L); String methodName = "depositForOwn"; String methodDesc = ""; String remark = "投资者抵押"; - this.invokeCall(toAddress1, value, contractAddress, methodName, methodDesc, remark); + this.invokeCall(sender, value, contractAddress, methodName, methodDesc, remark); } /** * 调用合约 - 投资者退出抵押 @@ -422,6 +421,15 @@ public void quit() throws Exception { this.invokeCall(sender, value, contractAddress, methodName, methodDesc, remark, 0); } + @Test + public void pocmWithdraw() throws Exception { + BigInteger value = BigInteger.ZERO; + String methodName = "withdraw"; + String methodDesc = ""; + String remark = "投资者退出抵押"; + this.invokeCall(sender, value, contractAddress, methodName, methodDesc, remark, 50000_00000000L); + } + /** * 调用合约 - 共识保证金解锁后，退还所有申请过退出的用户的押金 - 合约拥有者操作 */ @@ -458,6 +466,16 @@ public void transferConsensusReward() throws Exception { this.invokeCall(sender, value, contractAddress, methodName, methodDesc, remark); } + @Test + public void transferProjectCandyAsset() throws Exception { + sender = "tNULSeBaMuU6sq72mptyghDXDWQXKJ5QUaWhGj"; + BigInteger value = BigInteger.ZERO; + String methodName = "transferProjectCandyAsset"; + String methodDesc = ""; + String remark = ""; + this.invokeCall(sender, value, contractAddress, methodName, methodDesc, remark, "tNULSeBaMnrs6JKrCy6TQdzYJZkMZJDng7QAsD", "199994360000003"); + } + /** * 调用合约 - 合约拥有者赎回共识保证金 */ diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/randomseed/RandomSeedSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/storagestructure/StorageStructureSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/storagestructure/StorageStructureSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/storagestructure/StorageStructureSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/storagestructure/StorageStructureSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/temp/ContractTempSendTxTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/tx/temp/ContractTempSendTxTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/tx/temp/ContractTempSendTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/tx/temp/ContractTempSendTxTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/utf8/Utf8Test.java b/module/nuls-cores/src/test/java/io/nuls/contract/utf8/Utf8Test.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/utf8/Utf8Test.java rename to module/nuls-cores/src/test/java/io/nuls/contract/utf8/Utf8Test.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/BeanUtilTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/util/BeanUtilTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/util/BeanUtilTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/util/BeanUtilTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractCodeHexString.java b/module/nuls-cores/src/test/java/io/nuls/contract/util/ContractCodeHexString.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractCodeHexString.java rename to module/nuls-cores/src/test/java/io/nuls/contract/util/ContractCodeHexString.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java b/module/nuls-cores/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java rename to module/nuls-cores/src/test/java/io/nuls/contract/util/ContractDBUtilTest.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/LedgerTestUtil.java b/module/nuls-cores/src/test/java/io/nuls/contract/util/LedgerTestUtil.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/util/LedgerTestUtil.java rename to module/nuls-cores/src/test/java/io/nuls/contract/util/LedgerTestUtil.java diff --git a/module/nuls-smart-contract/src/test/java/io/nuls/contract/util/VMContextMock.java b/module/nuls-cores/src/test/java/io/nuls/contract/util/VMContextMock.java similarity index 100% rename from module/nuls-smart-contract/src/test/java/io/nuls/contract/util/VMContextMock.java rename to module/nuls-cores/src/test/java/io/nuls/contract/util/VMContextMock.java diff --git a/module/nuls-cores/src/test/java/io/nuls/crosschain/DbTest.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/DbTest.java new file mode 100644 index 0000000000..3b6842bef7 --- /dev/null +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/DbTest.java @@ -0,0 +1,107 @@ +/** + * MIT License + *

+ * Copyright (c) 2017-2018 nuls.io + *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + *

+ * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.nuls.crosschain; + +import io.nuls.base.data.NulsHash; +import io.nuls.core.crypto.HexUtil; +import io.nuls.core.log.Log; +import io.nuls.core.model.ByteUtils; +import io.nuls.core.rockdb.service.RocksDBService; +import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; +import io.nuls.crosschain.constant.NulsCrossChainConstant; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.model.po.LocalVerifierPO; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.HashSet; +import java.util.Set; + +/** + * @author: PierreLuo + * @date: 2022/3/3 + */ +public class DbTest { + + + @BeforeClass + public static void before() { + Log.info("init"); + RocksDBService.init("/Users/pierreluo/IdeaProjects/nuls_newer_2.0/data/cross-chain/"); + System.out.println(); + } + + @Test + public void local_verifier() throws Exception { + byte[] stream = RocksDBService.get("local_verifier", ByteUtils.intToBytes(1)); + LocalVerifierPO po = new LocalVerifierPO(); + try { + po.parse(stream,0); + }catch (Exception e){ + Log.error(e); + } + Set set = new HashSet<>(po.getVerifierList()); + System.out.println(set.contains("NULSd6HgeBrHjCu88naeGG2etPbyh31YMfWc7")); + //System.out.println(set.contains("NULSd6HggfvuZoDMJ26kRpJ5uzC6WrRwko9iM")); + //System.out.println(set.contains("NULSd6Hga4mQkHAnQdhUiMmv1V3kQ4a84JaSb")); + //System.out.println(set.contains("NULSd6HgjHLnaPdyPYADSZy9UqewvJFEkAUP1")); + } + + @Test + public void registered_chain() throws Exception { + byte[] messageBytes = RocksDBService.get("registered_chain", NulsCrossChainConstant.DB_NAME_REGISTERED_CHAIN.getBytes()); + RegisteredChainMessage registeredChainMessage = new RegisteredChainMessage(); + registeredChainMessage.parse(messageBytes,0); + System.out.println(); + } + + @Test + public void new_ctx_status1() throws Exception { + //String hash = "75178d3968c258b58896f64c7fc93ed8d00c4ec69c51a06821cc0d1c1ef1cca7"; + String hash = "ace4c1ef75a047105604d12928ee9ae101ebeb1c6eb86c0ca124a725de4f2c90"; + byte[] stream = RocksDBService.get("new_ctx_status1", HexUtil.decode(hash)); + CtxStatusPO tx = new CtxStatusPO(); + tx.parse(stream,0); + System.out.println(); + } + + @Test + public void send_height() throws Exception { + byte[] valueBytes = RocksDBService.get(NulsCrossChainConstant.DB_NAME_SEND_HEIGHT+1, ByteUtils.longToBytes(12108843)); + SendCtxHashPO po = new SendCtxHashPO(); + po.parse(valueBytes,0); + System.out.println(); + } + + @Test + public void convert_hash_ctx() throws Exception { + String hash = "75178d3968c258b58896f64c7fc93ed8d00c4ec69c51a06821cc0d1c1ef1cca7"; + byte[] valueBytes = RocksDBService.get(NulsCrossChainConstant.DB_NAME_CONVERT_HASH_CTX+1, HexUtil.decode(hash)); + NulsHash nulsHash = new NulsHash(valueBytes); + System.out.println(nulsHash.toHex()); + } + + +} diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/StorageTest.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/StorageTest.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/StorageTest.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/StorageTest.java index 8e3f70aecb..659963fcbc 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/StorageTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/StorageTest.java @@ -1,4 +1,4 @@ -package io.nuls.test; +package io.nuls.crosschain; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TestVerifierChange.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/TestVerifierChange.java similarity index 99% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TestVerifierChange.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/TestVerifierChange.java index 3095653f39..1fbf639d5a 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TestVerifierChange.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/TestVerifierChange.java @@ -1,4 +1,4 @@ -package io.nuls.test; +package io.nuls.crosschain; import io.nuls.base.data.Transaction; import io.nuls.core.crypto.HexUtil; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/TxSendTester.java similarity index 99% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/TxSendTester.java index ae7bbb5fbd..4b75cdced3 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/TxSendTester.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/TxSendTester.java @@ -1,4 +1,4 @@ -package io.nuls.test; +package io.nuls.crosschain; import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/datacheck/SignCheck.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/datacheck/SignCheck.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/datacheck/SignCheck.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/datacheck/SignCheck.java index 1db75dd22b..f8350bafcb 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/datacheck/SignCheck.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/datacheck/SignCheck.java @@ -1,4 +1,4 @@ -package io.nuls.test.datacheck; +package io.nuls.crosschain.datacheck; import io.nuls.base.signture.TransactionSignature; import io.nuls.core.crypto.ECKey; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/datacheck/TransactionCheck.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/datacheck/TransactionCheck.java similarity index 98% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/datacheck/TransactionCheck.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/datacheck/TransactionCheck.java index cec67fb30d..3c85f7ddbb 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/datacheck/TransactionCheck.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/datacheck/TransactionCheck.java @@ -1,4 +1,4 @@ -package io.nuls.test.datacheck; +package io.nuls.crosschain.datacheck; import io.nuls.base.basic.AddressTool; import io.nuls.base.data.Transaction; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/resend/ReadCtx.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/resend/ReadCtx.java similarity index 95% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/resend/ReadCtx.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/resend/ReadCtx.java index 1cb938cd55..c7b0d46c07 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/resend/ReadCtx.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/resend/ReadCtx.java @@ -1,6 +1,5 @@ -package io.nuls.test.resend; +package io.nuls.crosschain.resend; -import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; import io.nuls.base.signture.TransactionSignature; import io.nuls.core.constant.ErrorCode; @@ -16,8 +15,8 @@ import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.crosschain.base.constant.CommandConstant; import io.nuls.crosschain.base.message.BroadCtxSignMessage; -import io.nuls.crosschain.nuls.model.po.CtxStatusPO; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; +import io.nuls.crosschain.model.po.CtxStatusPO; +import io.nuls.crosschain.rpc.call.NetWorkCall; import java.io.IOException; import java.util.ArrayList; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/AccountTest.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/AccountTest.java similarity index 99% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/AccountTest.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/AccountTest.java index 493ca37d91..95d543a40d 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/AccountTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/AccountTest.java @@ -1,4 +1,4 @@ -package io.nuls.test.rpc; +package io.nuls.crosschain.rpc; import io.nuls.base.data.BlockExtendsData; import io.nuls.core.crypto.HexUtil; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/NulsCrossChainTest.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/NulsCrossChainTest.java similarity index 99% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/NulsCrossChainTest.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/NulsCrossChainTest.java index 9667be6496..1cc5a2f653 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/NulsCrossChainTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/NulsCrossChainTest.java @@ -1,4 +1,4 @@ -package io.nuls.test.rpc; +package io.nuls.crosschain.rpc; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; import io.nuls.core.rpc.info.Constants; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/util/CallUtil.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/util/CallUtil.java similarity index 97% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/util/CallUtil.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/util/CallUtil.java index 2f3a165d02..32d5ce7760 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/rpc/util/CallUtil.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/rpc/util/CallUtil.java @@ -1,4 +1,4 @@ -package io.nuls.test.rpc.util; +package io.nuls.crosschain.rpc.util; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.model.ModuleE; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/storage/NewCtxServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/storage/NewCtxServiceTest.java similarity index 84% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/storage/NewCtxServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/storage/NewCtxServiceTest.java index 032d8159a9..11605990f1 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/storage/NewCtxServiceTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/storage/NewCtxServiceTest.java @@ -1,12 +1,4 @@ -package io.nuls.test.storage; - -import io.nuls.base.data.NulsHash; -import io.nuls.base.data.Transaction; -import io.nuls.crosschain.nuls.CrossChainBootStrap; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.crypto.HexUtil; -import org.junit.BeforeClass; -import org.junit.Test; +package io.nuls.crosschain.storage; public class NewCtxServiceTest { /*private static NewCtxService newCtxService; diff --git a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/storage/SendHeightServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/crosschain/storage/SendHeightServiceTest.java similarity index 89% rename from module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/storage/SendHeightServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/crosschain/storage/SendHeightServiceTest.java index 615eda1462..85cc5f7be1 100644 --- a/module/nuls-cross-chain/cross-chain/src/test/java/io/nuls/test/storage/SendHeightServiceTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/crosschain/storage/SendHeightServiceTest.java @@ -1,10 +1,10 @@ -package io.nuls.test.storage; +package io.nuls.crosschain.storage; import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; -import io.nuls.crosschain.nuls.CrossChainBootStrap; -import io.nuls.crosschain.nuls.model.po.SendCtxHashPO; -import io.nuls.crosschain.nuls.srorage.SendHeightService; +import io.nuls.crosschain.CrossChainBootStrap; +import io.nuls.crosschain.model.po.SendCtxHashPO; +import io.nuls.crosschain.srorage.SendHeightService; import io.nuls.core.core.ioc.SpringLiteContext; import io.nuls.core.crypto.HexUtil; import org.junit.BeforeClass; @@ -21,7 +21,7 @@ public class SendHeightServiceTest { @BeforeClass public static void beforeTest() { - CrossChainBootStrap.main(null); + //CrossChainBootStrap.main(null); CrossChainBootStrap accountBootstrap = SpringLiteContext.getBean(CrossChainBootStrap.class); //初始化配置 accountBootstrap.init(); diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdAssetRegTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdAssetRegTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdAssetRegTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdAssetRegTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdChainAsset.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdChainAsset.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdChainAsset.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdChainAsset.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdGenesisAsset.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdGenesisAsset.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdGenesisAsset.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdGenesisAsset.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdRollBackTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdRollBackTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdRollBackTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdRollBackTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdTxTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdTxTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdTxTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdUnconfirmedTxTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdUnconfirmedTxTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdUnconfirmedTxTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdUnconfirmedTxTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdValidateTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdValidateTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdValidateTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdValidateTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdWrongDataTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdWrongDataTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/CmdWrongDataTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/CmdWrongDataTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/HexTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/HexTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/HexTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/HexTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/KernelTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/KernelTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/KernelTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/KernelTest.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/TranList.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/TranList.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/cmd/TranList.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/cmd/TranList.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/constant/TestConfig.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/constant/TestConfig.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/constant/TestConfig.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/constant/TestConfig.java diff --git a/module/nuls-ledger/src/test/java/io/nuls/ledger/test/validater/TotalAmountTest.java b/module/nuls-cores/src/test/java/io/nuls/ledger/test/validater/TotalAmountTest.java similarity index 100% rename from module/nuls-ledger/src/test/java/io/nuls/ledger/test/validater/TotalAmountTest.java rename to module/nuls-cores/src/test/java/io/nuls/ledger/test/validater/TotalAmountTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/RpcTest.java b/module/nuls-cores/src/test/java/io/nuls/network/RpcTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/RpcTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/RpcTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/Test1.java b/module/nuls-cores/src/test/java/io/nuls/network/Test1.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/Test1.java rename to module/nuls-cores/src/test/java/io/nuls/network/Test1.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/TestConstant.java b/module/nuls-cores/src/test/java/io/nuls/network/TestConstant.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/TestConstant.java rename to module/nuls-cores/src/test/java/io/nuls/network/TestConstant.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/manager/threads/MessageSendTaskTest.java b/module/nuls-cores/src/test/java/io/nuls/network/manager/threads/MessageSendTaskTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/manager/threads/MessageSendTaskTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/manager/threads/MessageSendTaskTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/manager/threads/ThreadTest.java b/module/nuls-cores/src/test/java/io/nuls/network/manager/threads/ThreadTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/manager/threads/ThreadTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/manager/threads/ThreadTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/manager/threads/ThreadTest2.java b/module/nuls-cores/src/test/java/io/nuls/network/manager/threads/ThreadTest2.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/manager/threads/ThreadTest2.java rename to module/nuls-cores/src/test/java/io/nuls/network/manager/threads/ThreadTest2.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/model/NetTimeTest.java b/module/nuls-cores/src/test/java/io/nuls/network/model/NetTimeTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/model/NetTimeTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/model/NetTimeTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/other/AtomicIntegerTest.java b/module/nuls-cores/src/test/java/io/nuls/network/other/AtomicIntegerTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/other/AtomicIntegerTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/other/AtomicIntegerTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/rpc/CrossRpcTest.java b/module/nuls-cores/src/test/java/io/nuls/network/rpc/CrossRpcTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/rpc/CrossRpcTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/rpc/CrossRpcTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/rpc/MessageRpcTest.java b/module/nuls-cores/src/test/java/io/nuls/network/rpc/MessageRpcTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/rpc/MessageRpcTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/rpc/MessageRpcTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/rpc/NodeGroupRpcTest.java b/module/nuls-cores/src/test/java/io/nuls/network/rpc/NodeGroupRpcTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/rpc/NodeGroupRpcTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/rpc/NodeGroupRpcTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/rpc/NodeRpcTest.java b/module/nuls-cores/src/test/java/io/nuls/network/rpc/NodeRpcTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/rpc/NodeRpcTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/rpc/NodeRpcTest.java diff --git a/module/nuls-network/src/test/java/io/nuls/network/rpc/ProtocolRegisterTest.java b/module/nuls-cores/src/test/java/io/nuls/network/rpc/ProtocolRegisterTest.java similarity index 100% rename from module/nuls-network/src/test/java/io/nuls/network/rpc/ProtocolRegisterTest.java rename to module/nuls-cores/src/test/java/io/nuls/network/rpc/ProtocolRegisterTest.java diff --git a/module/nuls-protocol-update/src/test/java/io/nuls/protocol/model/ProtocolVersionTest.java b/module/nuls-cores/src/test/java/io/nuls/protocol/model/ProtocolVersionTest.java similarity index 100% rename from module/nuls-protocol-update/src/test/java/io/nuls/protocol/model/ProtocolVersionTest.java rename to module/nuls-cores/src/test/java/io/nuls/protocol/model/ProtocolVersionTest.java diff --git a/module/nuls-protocol-update/src/test/java/io/nuls/protocol/model/po/StatisticsInfoTest.java b/module/nuls-cores/src/test/java/io/nuls/protocol/model/po/StatisticsInfoTest.java similarity index 100% rename from module/nuls-protocol-update/src/test/java/io/nuls/protocol/model/po/StatisticsInfoTest.java rename to module/nuls-cores/src/test/java/io/nuls/protocol/model/po/StatisticsInfoTest.java diff --git a/module/nuls-protocol-update/src/test/java/io/nuls/protocol/rpc/callback/BlockHeaderInvokeTest.java b/module/nuls-cores/src/test/java/io/nuls/protocol/rpc/callback/BlockHeaderInvokeTest.java similarity index 100% rename from module/nuls-protocol-update/src/test/java/io/nuls/protocol/rpc/callback/BlockHeaderInvokeTest.java rename to module/nuls-cores/src/test/java/io/nuls/protocol/rpc/callback/BlockHeaderInvokeTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/BatchCreateAgentTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/BatchCreateAgentTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/BatchCreateAgentTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/BatchCreateAgentTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/CreateTxThread.java b/module/nuls-cores/src/test/java/io/nuls/transaction/CreateTxThread.java similarity index 94% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/CreateTxThread.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/CreateTxThread.java index 4d8dd7c7d9..d13d32e5f1 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/CreateTxThread.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/CreateTxThread.java @@ -24,11 +24,11 @@ package io.nuls.transaction; +import io.nuls.common.ConfigBean; import io.nuls.core.rpc.model.ModuleE; import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.dto.CoinDTO; import org.junit.Assert; @@ -68,7 +68,12 @@ public class CreateTxThread implements Runnable { public CreateTxThread(){ try { chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId, 1024*1024,1000,20,20000,60000)); + //chain.setConfig(new ConfigBean(chainId, assetId, 1024*1024,1000,20,20000,60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } catch (Exception e) { e.printStackTrace(); } diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/TestCommonUtil.java b/module/nuls-cores/src/test/java/io/nuls/transaction/TestCommonUtil.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/TestCommonUtil.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/TestCommonUtil.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/TestConstant.java b/module/nuls-cores/src/test/java/io/nuls/transaction/TestConstant.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/TestConstant.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/TestConstant.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/TestJyc.java b/module/nuls-cores/src/test/java/io/nuls/transaction/TestJyc.java similarity index 95% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/TestJyc.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/TestJyc.java index e88cb55f13..5249bdd45b 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/TestJyc.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/TestJyc.java @@ -24,11 +24,11 @@ package io.nuls.transaction; +import io.nuls.common.ConfigBean; import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.info.NoUse; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import org.junit.BeforeClass; import org.junit.Test; @@ -55,7 +55,12 @@ public static void before() throws Exception { NoUse.mockModule(); ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); chain = new Chain(); - chain.setConfig(new ConfigBean(CHAIN_ID, ASSET_ID, 1024 * 1024, 1000, 20, 20000, 60000)); + //chain.setConfig(new ConfigBean(CHAIN_ID, ASSET_ID, 1024 * 1024, 1000, 20, 20000, 60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(CHAIN_ID); + configBean.setAssetId(ASSET_ID); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } @Test diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/TestTx.java b/module/nuls-cores/src/test/java/io/nuls/transaction/TestTx.java similarity index 99% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/TestTx.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/TestTx.java index a21afeec3a..616cba428d 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/TestTx.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/TestTx.java @@ -26,6 +26,7 @@ import io.nuls.base.RPCUtil; import io.nuls.base.basic.AddressTool; +import io.nuls.common.ConfigBean; import io.nuls.core.basic.Page; import io.nuls.core.exception.NulsException; import io.nuls.core.parse.JSONUtils; @@ -36,7 +37,6 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.dto.CoinDTO; import io.nuls.transaction.rpc.call.LedgerCall; import org.junit.Assert; @@ -411,7 +411,12 @@ public void before() throws Exception { NoUse.mockModule(); ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId, 1024*1024,1000,20,20000,60000)); + //chain.setConfig(new ConfigBean(chainId, assetId, 1024*1024,1000,20,20000,60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } @Test diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/TxMultiSig.java b/module/nuls-cores/src/test/java/io/nuls/transaction/TxMultiSig.java similarity index 98% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/TxMultiSig.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/TxMultiSig.java index 2c70083fb2..a46b4e66d2 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/TxMultiSig.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/TxMultiSig.java @@ -24,6 +24,7 @@ import io.nuls.base.basic.AddressTool; import io.nuls.base.data.MultiSigAccount; +import io.nuls.common.ConfigBean; import io.nuls.core.crypto.HexUtil; import io.nuls.core.log.Log; import io.nuls.core.parse.JSONUtils; @@ -34,7 +35,6 @@ import io.nuls.core.rpc.model.message.Response; import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.dto.CoinDTO; import io.nuls.transaction.rpc.call.LedgerCall; import io.nuls.transaction.utils.TxUtil; @@ -90,7 +90,12 @@ public void before() throws Exception { NoUse.mockModule(); ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + //chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/TxValid.java b/module/nuls-cores/src/test/java/io/nuls/transaction/TxValid.java similarity index 99% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/TxValid.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/TxValid.java index 5fffe5ce7f..e7ba3c9d6a 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/TxValid.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/TxValid.java @@ -31,6 +31,7 @@ import io.nuls.base.data.po.BlockHeaderPo; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.log.Log; @@ -49,7 +50,6 @@ import io.nuls.core.thread.commom.NulsThreadFactory; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.dto.CoinDTO; import io.nuls.transaction.rpc.call.LedgerCall; import io.nuls.transaction.rpc.call.TransactionCall; @@ -114,7 +114,12 @@ public void before() throws Exception { NoUse.mockModule(); ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + //chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } private ExecutorService signExecutor = ThreadUtils.createThreadPool(Runtime.getRuntime().availableProcessors(), Integer.MAX_VALUE, new NulsThreadFactory("THREAD_VERIFIY_BLOCK_TXS_TEST")); diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/storage/ConfirmedTxStorageServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/storage/ConfirmedTxStorageServiceTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/storage/ConfirmedTxStorageServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/storage/ConfirmedTxStorageServiceTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/storage/UnconfirmedTxStorageServiceTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/storage/UnconfirmedTxStorageServiceTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/storage/UnconfirmedTxStorageServiceTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/storage/UnconfirmedTxStorageServiceTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/storage/rocksdb/RocksDBPerformanceTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/storage/rocksdb/RocksDBPerformanceTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/storage/rocksdb/RocksDBPerformanceTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/storage/rocksdb/RocksDBPerformanceTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/token/AccountData.java b/module/nuls-cores/src/test/java/io/nuls/transaction/token/AccountData.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/token/AccountData.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/token/AccountData.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/token/AccountDataBetaOne.java b/module/nuls-cores/src/test/java/io/nuls/transaction/token/AccountDataBetaOne.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/token/AccountDataBetaOne.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/token/AccountDataBetaOne.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/token/TestJSONObj.java b/module/nuls-cores/src/test/java/io/nuls/transaction/token/TestJSONObj.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/token/TestJSONObj.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/token/TestJSONObj.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/CreateTx.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/CreateTx.java similarity index 96% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/CreateTx.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/CreateTx.java index 423b70a739..34be33173d 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/CreateTx.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/CreateTx.java @@ -30,6 +30,7 @@ import io.nuls.base.data.*; import io.nuls.base.signture.P2PHKSignature; import io.nuls.base.signture.TransactionSignature; +import io.nuls.common.ConfigBean; import io.nuls.core.crypto.HexUtil; import io.nuls.core.exception.NulsException; import io.nuls.core.model.StringUtils; @@ -38,7 +39,6 @@ import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.transaction.constant.TxConstant; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.dto.CoinDTO; import io.nuls.transaction.rpc.call.LedgerCall; import io.nuls.transaction.rpc.call.TransactionCall; @@ -61,7 +61,12 @@ public class CreateTx { static { - chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + //chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } /** * 创建普通转账交易 diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/EntitySortTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/EntitySortTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/EntitySortTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/EntitySortTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/Transfer.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/Transfer.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/Transfer.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/Transfer.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxCompareTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxCompareTest.java similarity index 97% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxCompareTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxCompareTest.java index 668cd0a533..e56bff2f29 100644 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxCompareTest.java +++ b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxCompareTest.java @@ -26,6 +26,7 @@ import io.nuls.base.data.NulsHash; import io.nuls.base.data.Transaction; +import io.nuls.common.ConfigBean; import io.nuls.core.rpc.info.Constants; import io.nuls.core.rpc.info.HostInfo; import io.nuls.core.rpc.info.NoUse; @@ -34,7 +35,6 @@ import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; import io.nuls.core.rpc.util.NulsDateUtils; import io.nuls.transaction.model.bo.Chain; -import io.nuls.transaction.model.bo.config.ConfigBean; import io.nuls.transaction.model.dto.CoinDTO; import io.nuls.transaction.model.po.TransactionNetPO; import org.junit.Before; @@ -75,7 +75,12 @@ public void before() throws Exception { NoUse.mockModule(); ResponseMessageProcessor.syncKernel("ws://" + HostInfo.getLocalIP() + ":7771"); chain = new Chain(); - chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + //chain.setConfig(new ConfigBean(chainId, assetId, 1024 * 1024, 1000, 20, 20000, 60000)); + ConfigBean configBean = new ConfigBean(); + configBean.setChainId(chainId); + configBean.setAssetId(assetId); + configBean.setMaxViewGas(100000000L); + chain.setConfig(configBean); } private List randomIde(int count) { diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxCompareTool.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxCompareTool.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxCompareTool.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxCompareTool.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxSignTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/TxSignTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/TxSignTest.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/CompareObj.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/CompareObj.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/CompareObj.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/CompareObj.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/TestComparator.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/TestComparator.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/TestComparator.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/TestComparator.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/TestComparator2.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/TestComparator2.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/TestComparator2.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/TestComparator2.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/TestSort.java b/module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/TestSort.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/tx/compare/TestSort.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/tx/compare/TestSort.java diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/utils/HashSetDuplicateProcessorTest.java b/module/nuls-cores/src/test/java/io/nuls/transaction/utils/HashSetDuplicateProcessorTest.java similarity index 100% rename from module/nuls-transaction/src/test/java/io/nuls/transaction/utils/HashSetDuplicateProcessorTest.java rename to module/nuls-cores/src/test/java/io/nuls/transaction/utils/HashSetDuplicateProcessorTest.java diff --git a/module/nuls-account/src/test/resources/module.json b/module/nuls-cores/src/test/resources/account/module.json similarity index 100% rename from module/nuls-account/src/test/resources/module.json rename to module/nuls-cores/src/test/resources/account/module.json diff --git a/module/nuls-account/src/test/resources/protocol-config.json b/module/nuls-cores/src/test/resources/account/protocol-config.json similarity index 100% rename from module/nuls-account/src/test/resources/protocol-config.json rename to module/nuls-cores/src/test/resources/account/protocol-config.json diff --git a/module/nuls-cores/src/test/resources/block/FileEmpty.txt b/module/nuls-cores/src/test/resources/block/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/test/resources/chain/FileEmpty.txt b/module/nuls-cores/src/test/resources/chain/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/test/resources/consensus/FileEmpty.txt b/module/nuls-cores/src/test/resources/consensus/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-smart-contract/src/test/resources/NRC721Metadata-test.jar b/module/nuls-cores/src/test/resources/contract/NRC721Metadata-test.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/NRC721Metadata-test.jar rename to module/nuls-cores/src/test/resources/contract/NRC721Metadata-test.jar diff --git a/module/nuls-smart-contract/src/test/resources/NRC721Receiver-test.jar b/module/nuls-cores/src/test/resources/contract/NRC721Receiver-test.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/NRC721Receiver-test.jar rename to module/nuls-cores/src/test/resources/contract/NRC721Receiver-test.jar diff --git a/module/nuls-smart-contract/src/test/resources/contract-consensus-test.jar b/module/nuls-cores/src/test/resources/contract/contract-consensus-test.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/contract-consensus-test.jar rename to module/nuls-cores/src/test/resources/contract/contract-consensus-test.jar diff --git a/module/nuls-smart-contract/src/test/resources/contract-invoke-external-cmd-test.jar b/module/nuls-cores/src/test/resources/contract/contract-invoke-external-cmd-test.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/contract-invoke-external-cmd-test.jar rename to module/nuls-cores/src/test/resources/contract/contract-invoke-external-cmd-test.jar diff --git a/module/nuls-smart-contract/src/test/resources/contract-vm-testA-testA.jar b/module/nuls-cores/src/test/resources/contract/contract-vm-testA-testA.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/contract-vm-testA-testA.jar rename to module/nuls-cores/src/test/resources/contract/contract-vm-testA-testA.jar diff --git a/module/nuls-smart-contract/src/test/resources/contract-vm-testB-testB.jar b/module/nuls-cores/src/test/resources/contract/contract-vm-testB-testB.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/contract-vm-testB-testB.jar rename to module/nuls-cores/src/test/resources/contract/contract-vm-testB-testB.jar diff --git a/module/nuls-smart-contract/src/test/resources/contract_call_contract b/module/nuls-cores/src/test/resources/contract/contract_call_contract similarity index 100% rename from module/nuls-smart-contract/src/test/resources/contract_call_contract rename to module/nuls-cores/src/test/resources/contract/contract_call_contract diff --git a/module/nuls-smart-contract/src/test/resources/cross-locked-nrc20 b/module/nuls-cores/src/test/resources/contract/cross-locked-nrc20 similarity index 100% rename from module/nuls-smart-contract/src/test/resources/cross-locked-nrc20 rename to module/nuls-cores/src/test/resources/contract/cross-locked-nrc20 diff --git a/module/nuls-smart-contract/src/test/resources/cross-token-system-contract-test1.jar b/module/nuls-cores/src/test/resources/contract/cross-token-system-contract-test1.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/cross-token-system-contract-test1.jar rename to module/nuls-cores/src/test/resources/contract/cross-token-system-contract-test1.jar diff --git a/module/nuls-smart-contract/src/test/resources/depth-contract-test1.jar b/module/nuls-cores/src/test/resources/contract/depth-contract-test1.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/depth-contract-test1.jar rename to module/nuls-cores/src/test/resources/contract/depth-contract-test1.jar diff --git a/module/nuls-smart-contract/src/test/resources/maven-plugin-test.jar b/module/nuls-cores/src/test/resources/contract/maven-plugin-test.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/maven-plugin-test.jar rename to module/nuls-cores/src/test/resources/contract/maven-plugin-test.jar diff --git a/module/nuls-smart-contract/src/test/resources/multi-asset-contract b/module/nuls-cores/src/test/resources/contract/multi-asset-contract similarity index 100% rename from module/nuls-smart-contract/src/test/resources/multi-asset-contract rename to module/nuls-cores/src/test/resources/contract/multi-asset-contract diff --git a/module/nuls-smart-contract/src/test/resources/nrc20 b/module/nuls-cores/src/test/resources/contract/nrc20 similarity index 100% rename from module/nuls-smart-contract/src/test/resources/nrc20 rename to module/nuls-cores/src/test/resources/contract/nrc20 diff --git a/module/nuls-smart-contract/src/test/resources/nrc20-locked-token b/module/nuls-cores/src/test/resources/contract/nrc20-locked-token similarity index 100% rename from module/nuls-smart-contract/src/test/resources/nrc20-locked-token rename to module/nuls-cores/src/test/resources/contract/nrc20-locked-token diff --git a/module/nuls-smart-contract/src/test/resources/nuls-cross-chain-nrc20-test.jar b/module/nuls-cores/src/test/resources/contract/nuls-cross-chain-nrc20-test.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/nuls-cross-chain-nrc20-test.jar rename to module/nuls-cores/src/test/resources/contract/nuls-cross-chain-nrc20-test.jar diff --git a/module/nuls-smart-contract/src/test/resources/pocmContract-v3 b/module/nuls-cores/src/test/resources/contract/pocmContract-v3 similarity index 100% rename from module/nuls-smart-contract/src/test/resources/pocmContract-v3 rename to module/nuls-cores/src/test/resources/contract/pocmContract-v3 diff --git a/module/nuls-smart-contract/src/test/resources/randomseed-test1.jar b/module/nuls-cores/src/test/resources/contract/randomseed-test1.jar similarity index 100% rename from module/nuls-smart-contract/src/test/resources/randomseed-test1.jar rename to module/nuls-cores/src/test/resources/contract/randomseed-test1.jar diff --git a/module/nuls-smart-contract/src/test/resources/simple_chinese b/module/nuls-cores/src/test/resources/contract/simple_chinese similarity index 100% rename from module/nuls-smart-contract/src/test/resources/simple_chinese rename to module/nuls-cores/src/test/resources/contract/simple_chinese diff --git a/module/nuls-smart-contract/src/test/resources/token_contract b/module/nuls-cores/src/test/resources/contract/token_contract similarity index 100% rename from module/nuls-smart-contract/src/test/resources/token_contract rename to module/nuls-cores/src/test/resources/contract/token_contract diff --git a/module/nuls-smart-contract/src/test/resources/vote_contract b/module/nuls-cores/src/test/resources/contract/vote_contract similarity index 100% rename from module/nuls-smart-contract/src/test/resources/vote_contract rename to module/nuls-cores/src/test/resources/contract/vote_contract diff --git a/module/nuls-cores/src/test/resources/crosschain/FileEmpty.txt b/module/nuls-cores/src/test/resources/crosschain/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/test/resources/ledger/FileEmpty.txt b/module/nuls-cores/src/test/resources/ledger/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/test/resources/network/FileEmpty.txt b/module/nuls-cores/src/test/resources/network/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-cores/src/test/resources/protocol/FileEmpty.txt b/module/nuls-cores/src/test/resources/protocol/FileEmpty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/nuls-transaction/src/test/resources/alpha2.json b/module/nuls-cores/src/test/resources/transaction/alpha2.json similarity index 100% rename from module/nuls-transaction/src/test/resources/alpha2.json rename to module/nuls-cores/src/test/resources/transaction/alpha2.json diff --git a/module/nuls-transaction/src/test/resources/beta1.json b/module/nuls-cores/src/test/resources/transaction/beta1.json similarity index 100% rename from module/nuls-transaction/src/test/resources/beta1.json rename to module/nuls-cores/src/test/resources/transaction/beta1.json diff --git a/module/nuls-transaction/src/test/resources/beta2.json b/module/nuls-cores/src/test/resources/transaction/beta2.json similarity index 100% rename from module/nuls-transaction/src/test/resources/beta2.json rename to module/nuls-cores/src/test/resources/transaction/beta2.json diff --git a/module/nuls-cross-chain/base-lib/pom.xml b/module/nuls-cross-chain/base-lib/pom.xml deleted file mode 100644 index 90a4b47b22..0000000000 --- a/module/nuls-cross-chain/base-lib/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - io.nuls.v2.cross-chain - nuls-cross-chain - 1.0.0-SNAPSHOT - - 4.0.0 - base-lib - base-lib - - - UTF-8 - UTF-8 - 11 - 1.0.0-SNAPSHOT - - - - - - junit - junit - 4.13.1 - test - - - - - base-lib - - diff --git a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/BaseCrossChainBootStrap.java b/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/BaseCrossChainBootStrap.java deleted file mode 100644 index 49f940a05c..0000000000 --- a/module/nuls-cross-chain/base-lib/src/main/java/io/nuls/crosschain/base/BaseCrossChainBootStrap.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.nuls.crosschain.base; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.RpcModule; - -import java.util.*; - -import static io.nuls.crosschain.base.constant.CrossChainConstant.*; - -/** - * 跨链模块启动类 - * Cross Chain Module Startup and Initialization Management - * @author tag - * 2019/4/10 - */ -public abstract class BaseCrossChainBootStrap extends RpcModule { - private Set rpcPaths = new HashSet<>(){{add(RPC_PATH);}}; - - /** - * 新增需要加入RPC的CMD所在目录 - * Add the directory where the CMD needs to be added to RPC - * */ - protected void registerRpcPath(String rpcPath){ - rpcPaths.add(rpcPath); - } - - - @Override - public void init() { - super.init(); - } - - @Override - public Module moduleInfo() { - return new Module(ModuleE.CC.name,ROLE); - } - - /** - * 指定RpcCmd的包名 - * 可以不实现此方法，若不实现将使用spring init扫描的包 - * @return - */ - @Override - public Set getRpcCmdPackage(){ - return rpcPaths; - } - - protected Set getRpcPaths() { - return rpcPaths; - } - - public void setRpcPaths(Set rpcPaths) { - this.rpcPaths = rpcPaths; - } -} diff --git a/module/nuls-cross-chain/base-lib/src/main/resources/languages/zh-CHS.properties b/module/nuls-cross-chain/base-lib/src/main/resources/languages/zh-CHS.properties deleted file mode 100644 index b28b04f643..0000000000 --- a/module/nuls-cross-chain/base-lib/src/main/resources/languages/zh-CHS.properties +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/module/nuls-cross-chain/base-lib/src/test/java/io/nuls/AppTest.java b/module/nuls-cross-chain/base-lib/src/test/java/io/nuls/AppTest.java deleted file mode 100644 index 6074fa7d6c..0000000000 --- a/module/nuls-cross-chain/base-lib/src/test/java/io/nuls/AppTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.nuls; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -} diff --git a/module/nuls-cross-chain/cross-chain/module.ncf b/module/nuls-cross-chain/cross-chain/module.ncf deleted file mode 100644 index 2c89b74ee8..0000000000 --- a/module/nuls-cross-chain/cross-chain/module.ncf +++ /dev/null @@ -1,14 +0,0 @@ -[JAVA] -APP_NAME=cross-chain -VERSION=1.0.0 -MAIN_CLASS=io.nuls.crosschain.nuls.CrossChainBootStrap -JOPT_XMS=256 -JOPT_XMX=256 -PrivateDependent=base-lib,nuls-base-protocol-update - -[Core] -Managed=1 - -[cross-chain] -moduleDynamicDependent=protocol-update,smart-contract - diff --git a/module/nuls-cross-chain/cross-chain/pom.xml b/module/nuls-cross-chain/cross-chain/pom.xml deleted file mode 100644 index b9dd4d7219..0000000000 --- a/module/nuls-cross-chain/cross-chain/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - io.nuls.v2.cross-chain - nuls-cross-chain - 1.0.0-SNAPSHOT - - 4.0.0 - cross-chain - nuls-cross-chain - - - - io.nuls.v2.cross-chain - base-lib - ${project.version} - - - io.nuls.v2 - nuls-base-api-provider - 1.0.0-SNAPSHOT - - - - - nuls-cross-chain - - diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/CrossChainBootStrap.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/CrossChainBootStrap.java deleted file mode 100644 index c5a7b04ade..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/CrossChainBootStrap.java +++ /dev/null @@ -1,231 +0,0 @@ -package io.nuls.crosschain.nuls; - -import io.nuls.base.api.provider.Provider; -import io.nuls.base.api.provider.ServiceManager; -import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.RegisterHelper; -import io.nuls.core.core.annotation.Autowired; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.config.ConfigurationLoader; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.log.Log; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; -import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.crosschain.base.BaseCrossChainBootStrap; -import io.nuls.crosschain.base.model.bo.txdata.RegisteredChainMessage; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConfig; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.call.AccountCall; -import io.nuls.crosschain.nuls.rpc.call.ChainManagerCall; -import io.nuls.crosschain.nuls.rpc.call.NetWorkCall; -import io.nuls.crosschain.nuls.srorage.RegisteredCrossChainService; -import io.nuls.crosschain.nuls.utils.manager.ChainManager; - -import java.lang.reflect.Field; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.stream.Collectors; - -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.*; -import static java.nio.charset.StandardCharsets.UTF_8; - - -/** - * 跨链模块启动类 - * Cross Chain Module Startup and Initialization Management - * @author tag - * 2019/4/10 - */ -@Component -public class CrossChainBootStrap extends BaseCrossChainBootStrap { - @Autowired - private NulsCrossChainConfig nulsCrossChainConfig; - @Autowired - private RegisteredCrossChainService registeredCrossChainService; - - @Autowired - private ChainManager chainManager; - - public static void main(String[] args){ - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - ConfigurationLoader configurationLoader = new ConfigurationLoader(); - configurationLoader.load(); - int defaultChainId = Integer.parseInt(configurationLoader.getValue("chainId")); - ServiceManager.init(defaultChainId, Provider.ProviderType.RPC); - NulsRpcModuleBootstrap.run(CONTEXT_PATH, args); - } - /** - * 初始化模块，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 - * 在onStart前会调用此方法 - * - */ - @Override - public void init() { - try { - super.init(); - initSys(); - //增加地址工具类初始化 - AddressTool.init(new AddressPrefixDatas()); - initDB(); - /** - * 添加RPC接口目录 - * Add RPC Interface Directory - * */ - registerRpcPath(RPC_PATH); - chainManager.initChain(); - }catch (Exception e){ - Log.error(e); - } - } - - @Override - public Module[] declareDependent() { - if (nulsCrossChainConfig.getMainChainId() == nulsCrossChainConfig.getChainId()) { - return new Module[]{ - new Module(ModuleE.NW.abbr, VERSION), - new Module(ModuleE.TX.abbr, VERSION), - new Module(ModuleE.CM.abbr, VERSION), - new Module(ModuleE.AC.abbr, VERSION), - new Module(ModuleE.CS.abbr, VERSION), - new Module(ModuleE.LG.abbr, VERSION), - new Module(ModuleE.BL.abbr, VERSION) - }; - }else{ - return new Module[]{ - new Module(ModuleE.NW.abbr, VERSION), - new Module(ModuleE.TX.abbr, VERSION), - new Module(ModuleE.AC.abbr, VERSION), - new Module(ModuleE.CS.abbr, VERSION), - new Module(ModuleE.LG.abbr, VERSION), - new Module(ModuleE.BL.abbr, VERSION) - }; - } - } - - @Override - public boolean doStart() { - try { - while (!isDependencieReady(ModuleE.NW.abbr) || !isDependencieReady(ModuleE.TX.abbr) || !isDependencieReady(ModuleE.CS.abbr)){ - Log.debug("wait depend modules ready"); - Thread.sleep(2000L); - } - return true; - }catch (Exception e){ - Log.error(e); - return false; - } - } - - @Override - public void onDependenciesReady(Module module){ - try { - /* - * 注册交易 - * Registered transactions - */ - if(module.getName().equals(ModuleE.TX.abbr)){ - for (Integer chainId:chainManager.getChainMap().keySet()) { - RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); - } - } - /* - * 注册协议,如果为非主网则需激活跨链网络 - */ - if (ModuleE.NW.abbr.equals(module.getName())) { - RegisterHelper.registerMsg(ProtocolGroupManager.getOneProtocol()); - for (Chain chain:chainManager.getChainMap().values()) { - if(!chain.isMainChain()){ - NetWorkCall.activeCrossNet(chain.getChainId(), chain.getConfig().getMaxOutAmount(), chain.getConfig().getMaxInAmount(), nulsCrossChainConfig.getCrossSeedIps()); - } - } - } - /* - * 如果为主网，向链管理模块过去完整的跨链注册信息 - */ - if (nulsCrossChainConfig.isMainNet() && (ModuleE.CM.abbr.equals(module.getName()))) { - RegisteredChainMessage registeredChainMessage = registeredCrossChainService.get(); - if(registeredChainMessage != null && registeredChainMessage.getChainInfoList() != null){ - chainManager.setRegisteredCrossChainList(registeredChainMessage.getChainInfoList()); - }else{ - registeredChainMessage = ChainManagerCall.getRegisteredChainInfo(chainManager); - registeredCrossChainService.save(registeredChainMessage); - chainManager.setRegisteredCrossChainList(registeredChainMessage.getChainInfoList()); - } - } -// chainManager.getRegisteredCrossChainList().stream().filter(d->d.getChainId() == 9) -// .forEach(chainInfo -> { -// Log.info("chain id {} 验证人列表：{}",chainInfo.getChainId(),chainInfo.getVerifierList()); -// // Log.info("当前高度:{}",chainManager.getChainHeaderMap().get(1).getHeight()); -// });; - /* - * 如果为账户模块启动，向账户模块发送链前缀 - */ - if (ModuleE.AC.abbr.equals(module.getName())) { - AccountCall.addAddressPrefix(chainManager.getPrefixList()); - } - - //智能合约交易注册 - if (module.getName().equals(ModuleE.SC.abbr)) { - chainManager.registerContractTx(); - } - - ConfigurationLoader configurationLoader = SpringLiteContext.getBean(ConfigurationLoader.class); - nulsCrossChainConfig.setSeedNodeList(Arrays.stream(configurationLoader.getValue(ModuleE.Constant.CONSENSUS, "seedNodes").split(",")) - .collect(Collectors.toSet())); - - }catch (Exception e){ - Log.error(e); - } - } - - @Override - public RpcModuleState onDependenciesReady() { - Log.debug("cc onDependenciesReady"); - chainManager.runChain(); - return RpcModuleState.Running; - } - - @Override - public RpcModuleState onDependenciesLoss(Module dependenciesModule) { - return RpcModuleState.Ready; - } - - /** - * 初始化系统编码 - * Initialization System Coding - */ - private void initSys() throws Exception { - System.setProperty(SYS_FILE_ENCODING, UTF_8.name()); - Field charset = Charset.class.getDeclaredField("defaultCharset"); - charset.setAccessible(true); - charset.set(null, UTF_8); - } - - /** - * 初始化数据库 - * Initialization database - */ - private void initDB() throws Exception { - RocksDBService.init(nulsCrossChainConfig.getDataFolder()); - RocksDBService.createTable(DB_NAME_CONSUME_LANGUAGE); - RocksDBService.createTable(DB_NAME_CONSUME_CONGIF); - RocksDBService.createTable(DB_NAME_LOCAL_VERIFIER); - /* - 已注册跨链的链信息操作表 - Registered Cross-Chain Chain Information Operating Table - key：RegisteredChain - value:已注册链信息列表 - */ - RocksDBService.createTable(NulsCrossChainConstant.DB_NAME_REGISTERED_CHAIN); - } - -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConfig.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConfig.java deleted file mode 100644 index 256e74bd4e..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/constant/NulsCrossChainConfig.java +++ /dev/null @@ -1,134 +0,0 @@ -package io.nuls.crosschain.nuls.constant; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.core.annotation.Value; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.crosschain.nuls.model.bo.config.ConfigBean; - -import java.io.File; -import java.util.Set; - -/** - * 跨链模块配置类 - * @author tag - * @date 2019-03-26 - * */ -@Component -@Configuration(domain = ModuleE.Constant.CROSS_CHAIN) -public class NulsCrossChainConfig extends ConfigBean implements ModuleConfig { - - private String dataPath; - - /** 模块code*/ - private String moduleCode; - - /** 主链链ID*/ - private int mainChainId; - - /** 主链主资产ID*/ - private int mainAssetId; - - /** 语言*/ - private String language; - - /** 编码*/ - private String encoding; - - private int crossCtxType; - - private boolean mainNet; - - /**默认链接到的跨链节点*/ - private String crossSeedIps; - - /** - * 种子节点列表 - */ - private Set seedNodeList; - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getDataFolder() { - return dataPath + File.separator + ModuleE.CC.name; - } - - public String getModuleCode() { - return moduleCode; - } - - public void setModuleCode(String moduleCode) { - this.moduleCode = moduleCode; - } - - public int getMainChainId() { - return mainChainId; - } - - public void setMainChainId(int mainChainId) { - this.mainChainId = mainChainId; - } - - public int getMainAssetId() { - return mainAssetId; - } - - public void setMainAssetId(int mainAssetId) { - this.mainAssetId = mainAssetId; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public int getCrossCtxType() { - return crossCtxType; - } - - public void setCrossCtxType(int crossCtxType) { - this.crossCtxType = crossCtxType; - } - - public boolean isMainNet() { - return mainNet; - } - - public void setMainNet(boolean mainNet) { - this.mainNet = mainNet; - } - - public String getCrossSeedIps() { - return crossSeedIps; - } - - public void setCrossSeedIps(String crossSeedIps) { - this.crossSeedIps = crossSeedIps; - } - - public Set getSeedNodeList() { - return seedNodeList; - } - - public void setSeedNodeList(Set seedNodeList) { - this.seedNodeList = seedNodeList; - } -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/config/ConfigBean.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/config/ConfigBean.java deleted file mode 100644 index 519adccada..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/model/bo/config/ConfigBean.java +++ /dev/null @@ -1,240 +0,0 @@ -package io.nuls.crosschain.nuls.model.bo.config; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.base.basic.NulsOutputStreamBuffer; -import io.nuls.base.data.BaseNulsData; -import io.nuls.core.exception.NulsException; -import io.nuls.core.parse.SerializeUtils; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** - * 跨链模块配置类 - * Consensus Module Configuration Class - * - * @author tag - * 2019/4/10 - */ -public class ConfigBean extends BaseNulsData { - /** - * 资产ID - * assets id - */ - private int assetId; - - /** - * chain id - */ - private int chainId; - - /** - * 最小链接数 - * Minimum number of links - * */ - private int minNodeAmount; - - /** - * 最大链接数 - * */ - private int maxOutAmount; - - /** - * 最大被链接数 - * */ - private int maxInAmount; - - /** - * 跨链交易被打包多少块之后广播给其他链 - * */ - private int sendHeight; - - /** - * 拜占庭比例 - * */ - private int byzantineRatio; - - /** - * 最小签名数 - * */ - private int minSignature; - - /** - * 主网验证人信息 - * */ - private String verifiers; - - /** - * 主网拜占庭比例 - * */ - private int mainByzantineRatio; - - /** - * 主网最大签名验证数 - * */ - private int maxSignatureCount; - - /** - * 主网验证人列表 - * */ - private Set verifierSet = new HashSet<>(); - - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public int getMinNodeAmount() { - return minNodeAmount; - } - - public void setMinNodeAmount(int minNodeAmount) { - this.minNodeAmount = minNodeAmount; - } - - public int getSendHeight() { - return sendHeight; - } - - public void setSendHeight(int sendHeight) { - this.sendHeight = sendHeight; - } - - public int getByzantineRatio() { - return byzantineRatio; - } - - public void setByzantineRatio(int byzantineRatio) { - this.byzantineRatio = byzantineRatio; - } - - public int getMaxOutAmount() { - return maxOutAmount; - } - - public void setMaxOutAmount(int maxOutAmount) { - this.maxOutAmount = maxOutAmount; - } - - public int getMaxInAmount() { - return maxInAmount; - } - - public void setMaxInAmount(int maxInAmount) { - this.maxInAmount = maxInAmount; - } - - public int getMinSignature() { - return minSignature; - } - - public void setMinSignature(int minSignature) { - this.minSignature = minSignature; - } - - public String getVerifiers() { - return verifiers; - } - - public void setVerifiers(String verifiers) { - this.verifiers = verifiers; - } - - public int getMainByzantineRatio() { - return mainByzantineRatio; - } - - public void setMainByzantineRatio(int mainByzantineRatio) { - this.mainByzantineRatio = mainByzantineRatio; - } - - public int getMaxSignatureCount() { - return maxSignatureCount; - } - - public void setMaxSignatureCount(int maxSignatureCount) { - this.maxSignatureCount = maxSignatureCount; - } - - public Set getVerifierSet() { - return verifierSet; - } - - public void setVerifierSet(Set verifierSet) { - this.verifierSet = verifierSet; - } - - @Override - protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { - stream.writeUint16(assetId); - stream.writeUint16(chainId); - stream.writeUint16(minNodeAmount); - stream.writeUint16(maxOutAmount); - stream.writeUint16(maxInAmount); - stream.writeUint16(sendHeight); - stream.writeUint16(byzantineRatio); - stream.writeUint16(minSignature); - stream.writeString(verifiers); - stream.writeUint16(mainByzantineRatio); - stream.writeUint16(maxSignatureCount); - int registerCount = verifierSet == null ? 0 : verifierSet.size(); - stream.writeVarInt(registerCount); - if(verifierSet != null){ - for (String registerAgent:verifierSet) { - stream.writeString(registerAgent); - } - } - } - - @Override - public void parse(NulsByteBuffer byteBuffer) throws NulsException { - this.assetId = byteBuffer.readUint16(); - this.chainId = byteBuffer.readUint16(); - this.minNodeAmount = byteBuffer.readUint16(); - this.maxOutAmount = byteBuffer.readUint16(); - this.maxInAmount = byteBuffer.readUint16(); - this.sendHeight = byteBuffer.readUint16(); - this.byzantineRatio = byteBuffer.readUint16(); - this.minNodeAmount = byteBuffer.readUint16(); - this.verifiers = byteBuffer.readString(); - this.mainByzantineRatio = byteBuffer.readUint16(); - this.maxSignatureCount = byteBuffer.readUint16(); - int registerCount = (int) byteBuffer.readVarInt(); - if(registerCount > 0){ - Set verifierSet = new HashSet<>(); - for (int i = 0; i < registerCount; i++) { - verifierSet.add(byteBuffer.readString()); - } - this.verifierSet = verifierSet; - } - } - - @Override - public int size() { - int size = 0; - size += SerializeUtils.sizeOfUint16() * 10; - size += SerializeUtils.sizeOfString(verifiers); - size += SerializeUtils.sizeOfVarInt(verifierSet == null ? 0 : verifierSet.size()); - if(verifierSet != null){ - for (String verifier:verifierSet) { - size += SerializeUtils.sizeOfString(verifier); - } - } - return size; - } -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/BlockCall.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/BlockCall.java deleted file mode 100644 index a168b63dd6..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/call/BlockCall.java +++ /dev/null @@ -1,81 +0,0 @@ -package io.nuls.crosschain.nuls.rpc.call; - -import io.nuls.base.RPCUtil; -import io.nuls.base.data.BlockHeader; -import io.nuls.core.exception.NulsException; -import io.nuls.core.rpc.info.Constants; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.model.message.Response; -import io.nuls.core.rpc.netty.processor.ResponseMessageProcessor; -import io.nuls.crosschain.nuls.constant.NulsCrossChainConstant; -import io.nuls.crosschain.nuls.model.bo.Chain; -import io.nuls.crosschain.nuls.rpc.callback.NewBlockHeightInvoke; - -import java.util.HashMap; -import java.util.Map; - -/** - * 调用其他模块跟交易相关的接口 - * - * @author tag - * @date 2019/4/12 - */ -public class BlockCall { - /** - * 区块最新高度 - * */ - public static boolean subscriptionNewBlockHeight(Chain chain) throws NulsException { - try { - Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); - params.put(Constants.VERSION_KEY_STR, "1.0"); - params.put(Constants.CHAIN_ID, chain.getChainId()); - String messageId = ResponseMessageProcessor.requestAndInvoke(ModuleE.BL.abbr, "subscriptionNewBlockHeight", - params, "0", "1", new NewBlockHeightInvoke()); - if(null != messageId){ - return true; - } - return false; - } catch (Exception e) { - throw new NulsException(e); - } - } - - /** - * 查询区块状态 - * */ - public static int getBlockStatus(Chain chain) { - try { - Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); - params.put(Constants.CHAIN_ID, chain.getChainId()); - Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.BL.abbr, "getStatus", params); - if (!cmdResp.isSuccess()) { - chain.getLogger().error("get block status error!"); - } - return (int)((HashMap) ((HashMap) cmdResp.getResponseData()).get("getStatus")).get("status"); - } catch (Exception e) { - chain.getLogger().error(e); - return 0; - } - } - - /** - * 查询最新区块高度 - * */ - public static BlockHeader getLatestBlockHeader(Chain chain) { - try { - Map params = new HashMap<>(NulsCrossChainConstant.INIT_CAPACITY_8); - params.put(Constants.CHAIN_ID, chain.getChainId()); - Response cmdResp = ResponseMessageProcessor.requestAndResponse(ModuleE.BL.abbr, "latestBlockHeader", params); - if (!cmdResp.isSuccess()) { - chain.getLogger().error("get block status error!"); - } - Map result = (Map) ((HashMap) cmdResp.getResponseData()).get("latestBlockHeader"); - BlockHeader blockHeader = new BlockHeader(); - blockHeader.parse(RPCUtil.decode((String) result.get("value")),0); - return blockHeader; - } catch (Exception e) { - chain.getLogger().error(e); - return null; - } - } -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/callback/NewBlockHeightInvoke.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/callback/NewBlockHeightInvoke.java deleted file mode 100644 index 649038c640..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/callback/NewBlockHeightInvoke.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.nuls.crosschain.nuls.rpc.callback; - -import com.fasterxml.jackson.core.JsonProcessingException; -import io.nuls.crosschain.nuls.servive.BlockService; -import io.nuls.crosschain.nuls.utils.LoggerUtil; -import io.nuls.core.rpc.invoke.BaseInvoke; -import io.nuls.core.rpc.model.message.Response; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.parse.JSONUtils; - -import java.util.HashMap; - -/** - * 接收最新区块回调信息 - * @author tag - * @date 2019/4/25 - * */ -public class NewBlockHeightInvoke extends BaseInvoke { - - private BlockService blockService = SpringLiteContext.getBean(BlockService.class); - @Override - public void callBack(Response response) { - try { - LoggerUtil.commonLog.info("收到区块高度更新消息:{}", JSONUtils.obj2json(response)); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - HashMap result = ((HashMap) response.getResponseData()); - blockService.newBlockHeight(result); - } -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/BlockCmd.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/BlockCmd.java deleted file mode 100644 index 4a2f9cb361..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/rpc/cmd/BlockCmd.java +++ /dev/null @@ -1,56 +0,0 @@ -package io.nuls.crosschain.nuls.rpc.cmd; - -import io.nuls.core.rpc.model.ResponseData; -import io.nuls.core.rpc.model.TypeDescriptor; -import io.nuls.crosschain.nuls.constant.ParamConstant; -import io.nuls.crosschain.nuls.servive.BlockService; -import io.nuls.core.rpc.cmd.BaseCmd; -import io.nuls.core.rpc.model.CmdAnnotation; -import io.nuls.core.rpc.model.Parameter; -import io.nuls.core.rpc.model.message.Response; -import io.nuls.core.basic.Result; -import io.nuls.core.core.annotation.Autowired; -import io.nuls.core.core.annotation.Component; - -import java.util.Map; - -/** - * 提供给区块模块调用的接口 - * @author tag - * @date 2019/4/25 - */ -@Component -public class BlockCmd extends BaseCmd { - @Autowired - private BlockService service; - /** - * 区块模块高度变化通知跨链模块 - * */ - @CmdAnnotation(cmd = "newBlockHeight", version = 1.0, description = "链区块高度变更/receive new block height") - @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID") - @Parameter(parameterName = "height", parameterType = "long", parameterDes = "链ID") - @ResponseData(description = "无特定返回值，没有错误即成功") - public Response newBlockHeight(Map params){ - Result result = service.newBlockHeight(params); - if(result.isFailed()){ - return failed(result.getErrorCode()); - } - return success(result.getData()); - } - - /** - * 节点同步状态变更 - * Node synchronization state change - * */ - @CmdAnnotation(cmd = "syncStatusUpdate", version = 1.0, description = "Node synchronization state change") - @Parameter(parameterName = "chainId", requestType = @TypeDescriptor(value = int.class), parameterDes = "链ID") - @Parameter(parameterName = "status", parameterType = "int", parameterDes = "状态0：同步中，1：同步完成") - @ResponseData(description = "无特定返回值，没有错误即成功") - public Response syncStatusUpdate(Map params){ - Result result = service.newBlockHeight(params); - if(result.isFailed()){ - return failed(result.getErrorCode()); - } - return success(result.getData()); - } -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConfigService.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConfigService.java deleted file mode 100644 index 9fda79e935..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/ConfigService.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.nuls.crosschain.nuls.srorage; -import io.nuls.crosschain.nuls.model.bo.config.ConfigBean; - -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author tag - * 2018/11/8 - * */ -public interface ConfigService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param bean 配置类/config bean - * @param chainID 链ID/chain id - * @return 保存是否成功/Is preservation successful? - * @exception Exception 数据保存失败 - * */ - boolean save(ConfigBean bean, int chainID)throws Exception; - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainID 链ID/chain id - * @return 配置信息类/config bean - * */ - ConfigBean get(int chainID); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainID 链ID/chain id - * @return 删除是否成功/Delete success - * */ - boolean delete(int chainID); - - /** - * 获取当前节点所有的链信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - * */ - Map getList(); -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConfigServiceImpl.java b/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConfigServiceImpl.java deleted file mode 100644 index aa9151786b..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/java/io/nuls/crosschain/nuls/srorage/imp/ConfigServiceImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -package io.nuls.crosschain.nuls.srorage.imp; - -import io.nuls.core.core.annotation.Component; -import io.nuls.crosschain.nuls.model.bo.config.ConfigBean; -import io.nuls.crosschain.nuls.srorage.ConfigService; -import io.nuls.core.rockdb.model.Entry; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.core.annotation.Service; -import io.nuls.core.log.Log; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.model.ObjectUtils; -import static io.nuls.crosschain.nuls.constant.NulsCrossChainConstant.*; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author tag - * 2018/11/8 - * */ -@Component -public class ConfigServiceImpl implements ConfigService { - @Override - public boolean save(ConfigBean bean, int chainID) throws Exception{ - if(bean == null){ - return false; - } - return RocksDBService.put(DB_NAME_CONSUME_CONGIF, ByteUtils.intToBytes(chainID), bean.serialize()); - } - - @Override - public ConfigBean get(int chainID) { - try { - byte[] value = RocksDBService.get(DB_NAME_CONSUME_CONGIF,ByteUtils.intToBytes(chainID)); - ConfigBean configBean = new ConfigBean(); - configBean.parse(value,0); - return configBean; - }catch (Exception e){ - Log.error(e); - return null; - } - } - - @Override - public boolean delete(int chainID) { - try { - return RocksDBService.delete(DB_NAME_CONSUME_CONGIF,ByteUtils.intToBytes(chainID)); - }catch (Exception e){ - Log.error(e); - return false; - } - } - - @Override - public Map getList() { - try { - List> list = RocksDBService.entryList(DB_NAME_CONSUME_CONGIF); - Map configBeanMap = new HashMap<>(INIT_CAPACITY); - for (Entryentry:list) { - int key = ByteUtils.bytesToInt(entry.getKey()); - ConfigBean configBean = new ConfigBean(); - configBean.parse(entry.getValue(),0); - configBeanMap.put(key,configBean); - } - return configBeanMap; - }catch (Exception e){ - Log.error(e); - return null; - } - } -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/resources/languages/en.properties b/module/nuls-cross-chain/cross-chain/src/main/resources/languages/en.properties deleted file mode 100644 index 7278ab5329..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/resources/languages/en.properties +++ /dev/null @@ -1,31 +0,0 @@ -cc_0001=Cross-Chain Transaction payer and payee cannot be the same Chain Account -cc_0002=No Payment Account for Cross-Chain Transactions -cc_0003=Cross-Chain Transactions Payment Accounts are not the same Chain Accounts -cc_0004=Cross-Chain Transaction Receiving Accounts is not the same Chain Account -cc_0005=Sorry, your credit is running low -cc_0006=There can only be one payment account for cross-chain transactions with multi-signature accounts. -cc_0007=Multi-Signed Account Cross-Chain Transaction Payment Account is not Multi-Signed Account -cc_0008=Multi-Signed Accounts Can't Issue Ordinary Cross-Chain Transactions -cc_0009=This account is not an encrypted account -cc_0010=Cross-Chain Transaction Payment Accounts Must Be Local Chain Accounts -cc_0011=Sorry, your credit is running low -cc_0012=Payment account and collection account cannot be omitted. -cc_0013=Interface call failed -cc_0014=Chain not exist -cc_0015=CoinData verify error -cc_0016=Transaction verify error -cc_0017=TxData verify error -cc_0018=Transaction commit fail -cc_0019=Transaction rollback fail -cc_0020=Not cross-chain transactions in this chain -cc_0021=Unregistered cross-chain transactions in this chain -cc_0022=Unregistered cross-chain transactions in target chain -cc_0023=Assets are registered across the chain -cc_0024=Cross-chain network unavailability -cc_0025=Chain unregistered -cc_0026=Chain Unregistered Verifier Information -cc_0027=Byzantine Verification Failure of Transaction Signature -cc_0028=Cross-Chain Asset Verification Error -cc_0029=Return address Buhe -cc_0030=Too many verifiers exited - diff --git a/module/nuls-cross-chain/cross-chain/src/main/resources/module.json b/module/nuls-cross-chain/cross-chain/src/main/resources/module.json deleted file mode 100644 index 3966dd979f..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/resources/module.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "maxOutAmount":20, - "maxInAmount":200, - "moduleCode":"cc", - "crossCtxType":10, - "mainNet":false -} diff --git a/module/nuls-cross-chain/cross-chain/src/main/resources/protocol-config.json b/module/nuls-cross-chain/cross-chain/src/main/resources/protocol-config.json deleted file mode 100644 index 32ffa16f43..0000000000 --- a/module/nuls-cross-chain/cross-chain/src/main/resources/protocol-config.json +++ /dev/null @@ -1,122 +0,0 @@ -[ - { - "version": "10", - "extend": "1", - "validTxs": [ - { - "type": "62", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "ResetChainInfoTxProcessor" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "1", - "extend": "", - "validTxs": [ - { - "type": "10", - "systemTx": false, - "unlockTx": false, - "verifySignature": false, - "verifyFee": true, - "handler": "CrossChainProcessorV1" - }, - { - "type": "24", - "systemTx": false, - "unlockTx": false, - "verifySignature": false, - "verifyFee": true, - "handler": "VerifierChangeProcessorV1" - }, - { - "type": "25", - "systemTx": false, - "unlockTx": false, - "verifySignature": false, - "verifyFee": true, - "handler": "VerifierInitProcessorV1" - }, - { - "type": "26", - "systemTx": false, - "unlockTx": false, - "verifySignature": false, - "verifyFee": true, - "handler": "ContractCrossChainProcessorV1" - }, - { - "type": "60", - "systemTx": false, - "unlockTx": false, - "verifySignature": false, - "verifyFee": true, - "handler": "RegisteredChainChangeProcessorV1" - }, - { - "type": "61", - "systemTx": false, - "unlockTx": false, - "verifySignature": false, - "verifyFee": true, - "handler": "ResetLocalVerifierProcessorV1" - } - ], - "validMsgs": [ - { - "name": "io.nuls.crosschain.base.message.BroadCtxHashMessage", - "protocolCmd": "recvCtxHash", - "handlers": "BroadCtxHashHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.BroadCtxSignMessage", - "protocolCmd": "recvCtxSign", - "handlers": "BroadCtxSignHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.CirculationMessage", - "protocolCmd": "recvCirculat", - "handlers": "CirculationHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.CtxStateMessage", - "protocolCmd": "recvCtxState", - "handlers": "CtxStateHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.GetCirculationMessage", - "protocolCmd": "getCirculat", - "handlers": "GetCirculationHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.GetCtxStateMessage", - "protocolCmd": "getCtxState", - "handlers": "GetCtxStateHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.GetOtherCtxMessage", - "protocolCmd": "getOtherCtx", - "handlers": "GetOtherCtxHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.NewOtherCtxMessage", - "protocolCmd": "recvOtherCtx", - "handlers": "NewOtherCtxHandlerV1" - }, - { - "name": "io.nuls.crosschain.base.message.CrossTxRehandleMessage", - "protocolCmd": "ctxRehandle", - "handlers": "CrossTxRehandleMsgHandlerV1" - } - ], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-cross-chain/pom.xml b/module/nuls-cross-chain/pom.xml deleted file mode 100644 index 11fca21da4..0000000000 --- a/module/nuls-cross-chain/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - io.nuls.v2.cross-chain - nuls-cross-chain - pom - - base-lib - cross-chain - - cross-chain - - - - - io.nuls.v2 - nuls-base-protocol-update - - - - diff --git a/module/nuls-cross-chain/readme.md b/module/nuls-cross-chain/readme.md deleted file mode 100644 index 32ca42b362..0000000000 --- a/module/nuls-cross-chain/readme.md +++ /dev/null @@ -1,31 +0,0 @@ -### 模块概述 - -#### 1 为什么要有《跨链》模块 - -​ 在NULS2.0的生态体系中允许多个不同协议的平行链同时运行交互，由于不同平行链间协议不同，所以他们之间的协议交互需要由NULS主网来中转，跨链模块就是用于将本链协议转换为NULS主网协议和将接收到的NULS主网协议转换为本链协议的功能模块。 - -#### 2《跨链》要做什么 - -- 发起跨链交易，将跨链交易转换为主网协议交易 -- 跨链交易链内拜占庭签名 -- 广播跨链相关交易 -- 跨链交易协议转换 -- 链外跨链交易拜占庭验证 -- 链外资产管理 -- 跨链验证人维护 -- 验证人变更维护 - -#### 3《跨链》在系统中的定位 - -​ 在NULS2.0的生态体系中，跨链模块主要负责跨链交易的发起，验证，协议转换，链外资产维护，验证人变更维护等。 - -依赖模块 - -- 交易管理模块 -- 网络模块 -- 共识模块 -- 链管理模块（主网需要依赖，平行链不需要依赖） -- 账本模块 - - - diff --git a/module/nuls-ledger/.gitignore b/module/nuls-ledger/.gitignore deleted file mode 100755 index 11761c77b0..0000000000 --- a/module/nuls-ledger/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.iml -.idea -target/ -/ledger -logs/ diff --git a/module/nuls-ledger/module.ncf b/module/nuls-ledger/module.ncf deleted file mode 100644 index 7bdf6f814e..0000000000 --- a/module/nuls-ledger/module.ncf +++ /dev/null @@ -1,12 +0,0 @@ -[JAVA] -APP_NAME=ledger -MAIN_CLASS=io.nuls.ledger.LedgerBootstrap -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=512 - -[Core] -Managed=1 - -[ledger] -moduleDynamicDependent=protocol-update diff --git a/module/nuls-ledger/pom.xml b/module/nuls-ledger/pom.xml deleted file mode 100644 index 9c7b197fd5..0000000000 --- a/module/nuls-ledger/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-ledger - - - io.nuls.v2 - nuls-base-protocol-update - - - - - nuls-ledger - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.8 - - - com.github.spotbugs - spotbugs - 3.1.9 - - - - - - diff --git a/module/nuls-ledger/src/main/assembly/bin/start.bat b/module/nuls-ledger/src/main/assembly/bin/start.bat deleted file mode 100644 index 48d76bb141..0000000000 --- a/module/nuls-ledger/src/main/assembly/bin/start.bat +++ /dev/null @@ -1,77 +0,0 @@ -@echo off -if "%OS%" == "Windows_NT" setlocal - -rem -------------------------------------------------------------------------- -rem Start script for the Reaper Server -rem -rem $Id: start.bat,v 1.0 2016/11/17 ln$ -rem --------------------------------------------------------------------------- - -rem 设置java运行环境 -rem Make sure prerequisite environment variables are set -set NULS_JAVA_HOME=..\jre -if not "%NULS_JAVA_HOME%" == "" goto gotJavaHome -echo The NULS_JAVA_HOME environment variable is not defined -echo This environment variable is needed to run this program -goto end -:gotJavaHome -if not exist "%NULS_JAVA_HOME%\bin\java.exe" goto noJavaHome -goto okJavaHome -:noJavaHome -if not "%JAVA_HOME%" == "" goto useSysJavaHome -echo The NULS_JAVA_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto end -:useSysJavaHome -set NULS_JAVA_HOME=%JAVA_HOME% -goto okJavaHome -:okJavaHome - -rem 打印NULS_JAVA_HOME变量 -rem echo NULS_JAVA_HOME=%NULS_JAVA_HOME% - -rem 设置SERVER_HOME变量 -rem Guess SERVER_HOME if not defined -if not "%SERVER_HOME%" == "" goto goReaperHome -set SERVER_HOME=. - -if exist "%SERVER_HOME%\bin\start.bat" goto okReaperHome -set SERVER_HOME=.. - -if exist "%SERVER_HOME%\bin\start.bat" goto okReaperHome -set SERVER_HOME=%~dp0 -cd %SERVER_HOME% -cd .. -set SERVER_HOME=%cd% - -:goReaperHome -echo %SERVER_HOME% -if exist "%SERVER_HOME%\bin\start.bat" goto okReaperHome -echo The SERVER_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto end -:okReaperHome - -rem 设置CLASSPATH -set CLASSPATH=%NULS_JAVA_HOME%\lib\tools.jar -set CLASSPATH=%CLASSPATH%;%SERVER_HOME% -set CLASSPATH=%CLASSPATH%;%SERVER_HOME%\conf;%SERVER_HOME%\libs\* - -rem call classpath.bat -rem del classpath.bat - -rem 打印CLASSPATH变量 -rem echo CLASSPATH=%CLASSPATH% - - -set _EXECJAVA="%NULS_JAVA_HOME%\bin\javaw" -set _JAVA_OPTS=-Dfile.encoding=UTF-8 -Xms1024m -Xmx4096m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256M -XX:MaxPermSize=256M -set _MAINCLASS=io.nuls.ledger.LedgerBootstrap - -goto doExec - -:doExec -echo NULS starting -%_EXECJAVA% %_JAVA_OPTS% -classpath "%CLASSPATH%" %_MAINCLASS% - -:end diff --git a/module/nuls-ledger/src/main/assembly/bin/start.sh b/module/nuls-ledger/src/main/assembly/bin/start.sh deleted file mode 100644 index b0ed51063f..0000000000 --- a/module/nuls-ledger/src/main/assembly/bin/start.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -SOURCE="$0" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ ${SOURCE} != /* ]] && SOURCE=${DIR}/${SOURCE} # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done - -SERVER_HOME="$( cd -P "$( dirname "$SOURCE" )" && cd .. && pwd )" - -export logdir=${SERVER_HOME}/logs - -CLASSPATH=${SERVER_HOME} -# add conf to classpath -if [ -d ${SERVER_HOME}/conf ]; then - CLASSPATH=${CLASSPATH}:${SERVER_HOME}/conf -fi - -# add jar to CLASSPATH -for file in ${SERVER_HOME}/*.jar; do - CLASSPATH=${CLASSPATH}:${file}; -done - - -# add libs to CLASSPATH -for file in ${SERVER_HOME}/libs/*.jar; do - echo ${file}; - CLASSPATH=${CLASSPATH}:${file}; -done - -# Get standard environment variables -#JAVA_OPTS="-Dfile.encoding=UTF-8 -server -Xms4096m -Xmx4096m" -JAVA_OPTS="-Dfile.encoding=UTF-8" - -MAIN_CLASS=io.nuls.ledger.LedgerBootstrap - -if [ ! -d ${logdir} ]; then - mkdir ${logdir} -fi - -# check jre exist -if [ -x ${SERVER_HOME}/jre/bin/java ]; then - nohup ${SERVER_HOME}/jre/bin/java ${JAVA_OPTS} -classpath ${CLASSPATH} ${MAIN_CLASS} 1>${SERVER_HOME}/logs/stdout.log 0>${SERVER_HOME}/logs/stderr.log 2>&1 & - exit 0 -fi - -JAVA_BIN=`which java` -# try to use JAVA_HOME jre -if [ -x ${JAVA_BIN} ]; then - nohup ${JAVA_BIN} ${JAVA_OPTS} -classpath ${CLASSPATH} ${MAIN_CLASS} 1>${SERVER_HOME}/logs/stdout.log 0>${SERVER_HOME}/logs/stderr.log 2>&1 & - exit 0 -fi - -echo "The JDK required to start NULS was not found." -exit 1 diff --git a/module/nuls-ledger/src/main/assembly/bin/stop.bat b/module/nuls-ledger/src/main/assembly/bin/stop.bat deleted file mode 100644 index d90ba987ed..0000000000 --- a/module/nuls-ledger/src/main/assembly/bin/stop.bat +++ /dev/null @@ -1 +0,0 @@ -taskkill /f /im javaw.exe \ No newline at end of file diff --git a/module/nuls-ledger/src/main/assembly/bin/stop.sh b/module/nuls-ledger/src/main/assembly/bin/stop.sh deleted file mode 100644 index c7615a2591..0000000000 --- a/module/nuls-ledger/src/main/assembly/bin/stop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -scriptdir=$(cd `dirname $0`; pwd) -homedir=`dirname $scriptdir` -pid=`ps -ef| grep $homedir |grep -v 'grep' |awk '{print $2}'` -if [ ! -z "$pid" ]; then - kill -9 $pid -fi \ No newline at end of file diff --git a/module/nuls-ledger/src/main/assembly/default.xml b/module/nuls-ledger/src/main/assembly/default.xml deleted file mode 100644 index 8cfb057764..0000000000 --- a/module/nuls-ledger/src/main/assembly/default.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - Stable - - dir - tar.gz - - - true - - - - true - libs - false - - - - - - ${basedir} - - - README.md - - - - src/main/assembly/bin - bin - 0744 - - *.sh - - - - src/main/resources - conf - - * - - - - - diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/LedgerBootstrap.java b/module/nuls-ledger/src/main/java/io/nuls/ledger/LedgerBootstrap.java deleted file mode 100644 index 5f05d3d441..0000000000 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/LedgerBootstrap.java +++ /dev/null @@ -1,163 +0,0 @@ -/*- - * ⁣⁣ - * MIT License - * ⁣⁣ - * Copyright (C) 2017 - 2018 nuls.io - * ⁣⁣ - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * ⁣⁣ - */ -package io.nuls.ledger; - -import io.nuls.base.basic.AddressTool; -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.base.protocol.ProtocolGroupManager; -import io.nuls.base.protocol.ProtocolLoader; -import io.nuls.base.protocol.RegisterHelper; -import io.nuls.core.core.annotation.Autowired; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.crypto.HexUtil; -import io.nuls.core.rpc.info.HostInfo; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; -import io.nuls.core.rpc.util.AddressPrefixDatas; -import io.nuls.core.rpc.util.NulsDateUtils; -import io.nuls.ledger.config.LedgerConfig; -import io.nuls.ledger.constant.LedgerConstant; -import io.nuls.ledger.manager.LedgerChainManager; -import io.nuls.ledger.utils.LoggerUtil; - -/** - * @author: Niels Wang - * @date: 2018/10/15 - */ -@Component -public class LedgerBootstrap extends RpcModule { - @Autowired - LedgerConfig ledgerConfig; - @Autowired - AddressPrefixDatas addressPrefixDatas; - - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); - } - - @Override - public Module[] declareDependent() { - - return new Module[]{ - Module.build(ModuleE.TX), - Module.build(ModuleE.NW), - Module.build(ModuleE.BL), - Module.build(ModuleE.AC) - }; - - } - - @Override - public Module moduleInfo() { - return new Module(ModuleE.LG.abbr, "1.0"); - } - - /** - * 初始化模块信息，比如初始化RockDB等，在此处初始化后，可在其他bean的afterPropertiesSet中使用 - */ - @Override - public void init() { - try { - super.init(); - //增加地址工具类初始化 - AddressTool.init(addressPrefixDatas); - LedgerConstant.UNCONFIRM_NONCE_EXPIRED_TIME = ledgerConfig.getUnconfirmedTxExpired(); - LedgerConstant.DEFAULT_ENCODING = ledgerConfig.getEncoding(); - LedgerConstant.blackHolePublicKey = HexUtil.decode(ledgerConfig.getBlackHolePublicKey()); - LedgerChainManager ledgerChainManager = SpringLiteContext.getBean(LedgerChainManager.class); - ledgerChainManager.initChains(); - ModuleHelper.init(this); - LoggerUtil.COMMON_LOG.info("Ledger data init complete!"); - } catch (Exception e) { - LoggerUtil.COMMON_LOG.error(e); - LoggerUtil.COMMON_LOG.error("start fail..."); - System.exit(-1); - } - - } - - @Override - public boolean doStart() { - //springLite容器初始化AppInitializing - LoggerUtil.COMMON_LOG.info("Ledger READY"); - return true; - } - - @Override - public void onDependenciesReady(Module module) { - try { - ProtocolLoader.load(ledgerConfig.getChainId()); - /*注册交易处理器*/ - if (ModuleE.TX.abbr.equals(module.getName())) { - int chainId = ledgerConfig.getChainId(); - boolean regSuccess = RegisterHelper.registerTx(chainId, ProtocolGroupManager.getCurrentProtocol(chainId)); - if (!regSuccess) { - LoggerUtil.COMMON_LOG.error("RegisterHelper.registerTx fail.."); - System.exit(-1); - } - LoggerUtil.COMMON_LOG.info("regTxRpc complete....."); - } - if (ModuleE.PU.abbr.equals(module.getName())) { - //注册相关交易 - boolean regSuccess = RegisterHelper.registerProtocol(ledgerConfig.getChainId()); - if (!regSuccess) { - LoggerUtil.COMMON_LOG.error("RegisterHelper.registerProtocol fail.."); - System.exit(-1); - } - LoggerUtil.COMMON_LOG.info("register protocol ..."); - } - /*处理区块信息*/ - if (ModuleE.BL.abbr.equals(module.getName())) { - LedgerChainManager ledgerChainManager = SpringLiteContext.getBean(LedgerChainManager.class); - ledgerChainManager.syncBlockHeight(); - } - - } catch (Exception e) { - LoggerUtil.COMMON_LOG.error(e); - System.exit(-1); - - } - } - - @Override - public RpcModuleState onDependenciesReady() { - LoggerUtil.COMMON_LOG.info("Ledger onDependenciesReady"); - NulsDateUtils.getInstance().start(5 * 60 * 1000); - return RpcModuleState.Running; - } - - @Override - public RpcModuleState onDependenciesLoss(Module dependenciesModule) { - return RpcModuleState.Ready; - } -} diff --git a/module/nuls-ledger/src/main/java/io/nuls/ledger/config/LedgerConfig.java b/module/nuls-ledger/src/main/java/io/nuls/ledger/config/LedgerConfig.java deleted file mode 100644 index 0e9e509edf..0000000000 --- a/module/nuls-ledger/src/main/java/io/nuls/ledger/config/LedgerConfig.java +++ /dev/null @@ -1,120 +0,0 @@ -package io.nuls.ledger.config; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; - -/** - * @Author: lanjinsheng - * @Time: 2019-03-14 14:11 - * @Description: 配置文件 - */ -@Component -@Configuration(domain = ModuleE.Constant.LEDGER) -public class LedgerConfig implements ModuleConfig { - private String logLevel = "DEBUG"; - private String language; - private String encoding; - private int unconfirmedTxExpired; - private String blackHolePublicKey; - private int chainId; - private int assetId; - private int assetRegDestroyAmount = 200; - private int decimals = 8; - private String symbol; - - public String getBlackHolePublicKey() { - return blackHolePublicKey; - } - - public void setBlackHolePublicKey(String blackHolePublicKey) { - this.blackHolePublicKey = blackHolePublicKey; - } - - /** - * ROCK DB 数据库文件存储路径 - */ - private String dataPath; - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public int getUnconfirmedTxExpired() { - return unconfirmedTxExpired; - } - - public void setUnconfirmedTxExpired(int unconfirmedTxExpired) { - this.unconfirmedTxExpired = unconfirmedTxExpired; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getLogLevel() { - return logLevel; - } - - public void setLogLevel(String logLevel) { - this.logLevel = logLevel; - } - - public int getAssetRegDestroyAmount() { - return assetRegDestroyAmount; - } - - public void setAssetRegDestroyAmount(int assetRegDestroyAmount) { - this.assetRegDestroyAmount = assetRegDestroyAmount; - } - - - public int getDecimals() { - return decimals; - } - - public void setDecimals(int decimals) { - this.decimals = decimals; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public String getSymbol() { - return symbol; - } - - public void setSymbol(String symbol) { - this.symbol = symbol; - } -} diff --git a/module/nuls-ledger/src/main/resources/languages/en.properties b/module/nuls-ledger/src/main/resources/languages/en.properties deleted file mode 100644 index 213987990a..0000000000 --- a/module/nuls-ledger/src/main/resources/languages/en.properties +++ /dev/null @@ -1,14 +0,0 @@ -lg_0001=Parameter error.tx is invalid. -lg_0002=Chain init Exception. -lg_1001=ORPHAN. -lg_1002=DOUBLE EXPENSES. -lg_1003=TX EXIST -lg_1004=BALANCE NOT ENOUGH -lg_1005=Tx from coin amount is less than to amount. -lg_1010=FAIL -lg_1011=ASSET DECIMAL PLACES ERROR -lg_1012=ASSET SYMBOL ERROR -lg_1013=ASSET NAME ERROR -lg_1014=ADDRESS ERROR -lg_1015=TX SIGNDIGEST ERROR -lg_1016=TX RPC ERROR diff --git a/module/nuls-ledger/src/main/resources/module.json b/module/nuls-ledger/src/main/resources/module.json deleted file mode 100644 index 8e628d9c40..0000000000 --- a/module/nuls-ledger/src/main/resources/module.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "language": "en", - "encoding": "UTF-8", - "unconfirmedTxExpired": 600, - "assetRegDestroyAmount": 200 -} \ No newline at end of file diff --git a/module/nuls-ledger/src/main/resources/protocol-config.json b/module/nuls-ledger/src/main/resources/protocol-config.json deleted file mode 100644 index 3243a7b821..0000000000 --- a/module/nuls-ledger/src/main/resources/protocol-config.json +++ /dev/null @@ -1,43 +0,0 @@ -[ - { - "version": "15", - "extend": "6", - "validTxs": [ - { - "type": "27", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AssetRegTransferProcessorV15" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - },{ - "version": "6", - "extend": "1", - "validTxs": [ - { - "type": "27", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "AssetRegTransferProcessorV5" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" -}, - { - "version": "1", - "extend": "", - "validTxs": [], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-network/module.ncf b/module/nuls-network/module.ncf deleted file mode 100644 index 8302af2a13..0000000000 --- a/module/nuls-network/module.ncf +++ /dev/null @@ -1,12 +0,0 @@ -[JAVA] -APP_NAME=network -MAIN_CLASS=io.nuls.network.NetworkBootstrap -JAVA_OPTS=--add-exports java.base\\\\\/jdk.internal.misc=ALL-UNNAMED -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=512 - -[Core] -Managed=1 - -[network] diff --git a/module/nuls-network/pom.xml b/module/nuls-network/pom.xml deleted file mode 100644 index d1aa46d9ba..0000000000 --- a/module/nuls-network/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-network - - - - - javax.servlet - javax.servlet-api - 4.0.1 - - - io.netty - netty-all - 4.1.72.Final - - - com.google.protobuf - protobuf-java - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.13.3 - - - - - nuls-network - - - - \ No newline at end of file diff --git a/module/nuls-network/src/main/java/io/nuls/network/cfg/NetworkConfig.java b/module/nuls-network/src/main/java/io/nuls/network/cfg/NetworkConfig.java deleted file mode 100644 index 60b4957698..0000000000 --- a/module/nuls-network/src/main/java/io/nuls/network/cfg/NetworkConfig.java +++ /dev/null @@ -1,251 +0,0 @@ -package io.nuls.network.cfg; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: lanjinsheng - * @Time: 2019-03-14 14:11 - * @Description: 配置文件 - */ -@Component -@Configuration(domain = ModuleE.Constant.NETWORK) -public class NetworkConfig implements ModuleConfig { - private String logLevel = "DEBUG"; - private int chainId; - private int mainChainId; - private int port; - - private long packetMagic; - - private int maxInCount; - - private int maxOutCount; - - private int maxInSameIp; - private String selfSeedIps; - private List seedIpList; - - private int crossPort; - - private int crossMaxInCount; - - private int crossMaxOutCount; - - private int crossMaxInSameIp; - private String moonSeedIps; - private List moonSeedIpList; - - private boolean moonNode; - - private String language; - private String encoding; - - private List localIps = new ArrayList<>(); - private int updatePeerInfoType = 0; - /** - * ROCK DB 数据库文件存储路径 - */ - private String dataPath; - /** - * 中心化网络服务接口 - */ - private String timeServers; - - public List getLocalIps() { - - return localIps; - } - - public String getLogLevel() { - return logLevel; - } - - public void setLogLevel(String logLevel) { - this.logLevel = logLevel; - } - - public String getExternalIp() { - if (localIps.size() > 0) { - return localIps.get(localIps.size() - 1); - } - return null; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - - public long getPacketMagic() { - return packetMagic; - } - - public void setPacketMagic(long packetMagic) { - this.packetMagic = packetMagic; - } - - public int getMaxInCount() { - return maxInCount; - } - - public void setMaxInCount(int maxInCount) { - this.maxInCount = maxInCount; - } - - public int getMaxOutCount() { - return maxOutCount; - } - - public void setMaxOutCount(int maxOutCount) { - this.maxOutCount = maxOutCount; - } - - public int getMaxInSameIp() { - return maxInSameIp; - } - - public void setMaxInSameIp(int maxInSameIp) { - this.maxInSameIp = maxInSameIp; - } - - public String getSelfSeedIps() { - return selfSeedIps; - } - - public void setSelfSeedIps(String selfSeedIps) { - this.selfSeedIps = selfSeedIps; - } - - public List getSeedIpList() { - return seedIpList; - } - - public void setSeedIpList(List seedIpList) { - this.seedIpList = seedIpList; - } - - public int getCrossPort() { - return crossPort; - } - - public void setCrossPort(int crossPort) { - this.crossPort = crossPort; - } - - public int getCrossMaxInCount() { - return crossMaxInCount; - } - - public void setCrossMaxInCount(int crossMaxInCount) { - this.crossMaxInCount = crossMaxInCount; - } - - public int getCrossMaxOutCount() { - return crossMaxOutCount; - } - - public void setCrossMaxOutCount(int crossMaxOutCount) { - this.crossMaxOutCount = crossMaxOutCount; - } - - public int getCrossMaxInSameIp() { - return crossMaxInSameIp; - } - - public void setCrossMaxInSameIp(int crossMaxInSameIp) { - this.crossMaxInSameIp = crossMaxInSameIp; - } - - public String getMoonSeedIps() { - return moonSeedIps; - } - - public void setMoonSeedIps(String moonSeedIps) { - this.moonSeedIps = moonSeedIps; - } - - public List getMoonSeedIpList() { - return moonSeedIpList; - } - - public void setMoonSeedIpList(List moonSeedIpList) { - this.moonSeedIpList = moonSeedIpList; - } - - public boolean isMoonNode() { - return moonNode; - } - - public void setMoonNode(boolean moonNode) { - this.moonNode = moonNode; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public void setLocalIps(List localIps) { - this.localIps = localIps; - } - - public int getUpdatePeerInfoType() { - return updatePeerInfoType; - } - - public void setUpdatePeerInfoType(int updatePeerInfoType) { - this.updatePeerInfoType = updatePeerInfoType; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getTimeServers() { - return timeServers; - } - - public void setTimeServers(String timeServers) { - this.timeServers = timeServers; - } - - public int getMainChainId() { - return mainChainId; - } - - public void setMainChainId(int mainChainId) { - this.mainChainId = mainChainId; - } -} diff --git a/module/nuls-network/src/main/resources/languages/en.properties b/module/nuls-network/src/main/resources/languages/en.properties deleted file mode 100644 index 6c83bab8e9..0000000000 --- a/module/nuls-network/src/main/resources/languages/en.properties +++ /dev/null @@ -1,6 +0,0 @@ -nw_0001=Net message error -nw_0002=Net message send fail -nw_0003=Net message send exception -nw_0004=Net message broadcast error -nw_0005=Peer node disconnect -nw_0006=Peer node miss channel exception diff --git a/module/nuls-network/src/main/resources/module.json b/module/nuls-network/src/main/resources/module.json deleted file mode 100644 index fd7be28bdd..0000000000 --- a/module/nuls-network/src/main/resources/module.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "language": "en", - "encoding": "UTF-8", - "port": 18001, - "chainId": 2, - "maxInCount": 300, - "maxOutCount": 20, - "packetMagic": 3136151, - "selfSeedIps": "192.168.1.57:8888", - "crossPort": 18002, - "crossMaxInCount": 300, - "crossMaxOutCount": 10, - "moonSeedIps": "192.168.1.192:8088", - "timeServers":"africa.pool.ntp.org,antarctica.pool.ntp.org,asia.pool.ntp.org,europe.pool.ntp.org,north-america.pool.ntp.org,oceania.pool.ntp.org,south-america.pool.ntp.org,ntp.aliyun.com,time.windows.com,time.apple.com,time.asia.apple.com,time.euro.apple.com,time.cloudflare.com,time.google.com" -} \ No newline at end of file diff --git a/module/nuls-protocol-update/module.ncf b/module/nuls-protocol-update/module.ncf deleted file mode 100644 index 1a12874890..0000000000 --- a/module/nuls-protocol-update/module.ncf +++ /dev/null @@ -1,12 +0,0 @@ -[JAVA] -APP_NAME=protocol-update -MAIN_CLASS=io.nuls.protocol.ProtocolUpdateBootstrap -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=256 - -[Core] -Managed=1 - -[protocol-update] -moduleDynamicDependent=smart-contract,cross-chain diff --git a/module/nuls-protocol-update/pom.xml b/module/nuls-protocol-update/pom.xml deleted file mode 100644 index 1ecb056b5a..0000000000 --- a/module/nuls-protocol-update/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-protocol-update - - - io.nuls.v2 - nuls-base-protocol-update - - - - nuls-protocol-update - - - \ No newline at end of file diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java b/module/nuls-protocol-update/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java deleted file mode 100644 index 9b80c4de9a..0000000000 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/ProtocolUpdateBootstrap.java +++ /dev/null @@ -1,128 +0,0 @@ -package io.nuls.protocol; - -import io.nuls.base.protocol.ModuleHelper; -import io.nuls.core.core.annotation.Autowired; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.log.Log; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.rpc.info.HostInfo; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.core.rpc.modulebootstrap.Module; -import io.nuls.core.rpc.modulebootstrap.NulsRpcModuleBootstrap; -import io.nuls.core.rpc.modulebootstrap.RpcModule; -import io.nuls.core.rpc.modulebootstrap.RpcModuleState; -import io.nuls.protocol.manager.ChainManager; -import io.nuls.protocol.model.ProtocolConfig; - -import static io.nuls.protocol.constant.Constant.PROTOCOL_CONFIG; - -/** - * 协议升级模块启动类 - * - * @author captain - * @version 1.0 - * @date 19-3-4 下午4:09 - */ -@Component -public class ProtocolUpdateBootstrap extends RpcModule { - - @Autowired - public static ProtocolConfig protocolConfig; - - @Autowired - private ChainManager chainManager; - - public static void main(String[] args) { - if (args == null || args.length == 0) { - args = new String[]{"ws://" + HostInfo.getLocalIP() + ":7771"}; - } - NulsRpcModuleBootstrap.run("io.nuls", args); - } - - /** - * 返回此模块的依赖模块 - * - * @return - */ - @Override - public Module[] declareDependent() { - return new Module[]{Module.build(ModuleE.BL)}; - } - - /** - * 返回当前模块的描述信息 - * @return - */ - @Override - public Module moduleInfo() { - return new Module(ModuleE.PU.abbr, "1.0"); - } - - - /** - * 初始化模块信息,比如初始化RockDB等,在此处初始化后,可在其他bean的afterPropertiesSet中使用 - */ - @Override - public void init() { - try { - super.init(); - initDb(); - chainManager.initChain(); - ModuleHelper.init(this); - } catch (Exception e) { - Log.error("ProtocolUpdateBootstrap init error!"); - throw new RuntimeException(e); - } - } - - /** - * 初始化数据库 - * Initialization database - */ - private void initDb() throws Exception { - //读取配置文件,数据存储根目录,初始化打开该目录下所有表连接并放入缓存 - RocksDBService.init(protocolConfig.getDataFolder()); - RocksDBService.createTable(PROTOCOL_CONFIG); - } - - /** - * 已完成spring init注入,开始启动模块 - * @return 如果启动完成返回true, 模块将进入ready状态, 若启动失败返回false, 10秒后会再次调用此方法 - */ - @Override - public boolean doStart() { - try { - while (!isDependencieReady(new Module(ModuleE.BL.abbr, ROLE))) { - Thread.sleep(1000); - } - //启动链 - chainManager.runChain(); - } catch (Exception e) { - Log.error("protocol module doStart error!"); - return false; - } - Log.info("protocol module ready"); - return true; - } - - /** - * 所有外部依赖进入ready状态后会调用此方法,正常启动后返回Running状态 - * @return - */ - @Override - public RpcModuleState onDependenciesReady() { - Log.info("protocol onDependenciesReady"); - return RpcModuleState.Running; - } - - /** - * 某个外部依赖连接丢失后,会调用此方法,可控制模块状态,如果返回Ready,则表明模块退化到Ready状态,当依赖重新准备完毕后,将重新触发onDependenciesReady方法,若返回的状态是Running,将不会重新触发onDependenciesReady - * @param module - * @return - */ - @Override - public RpcModuleState onDependenciesLoss(Module module) { - return RpcModuleState.Running; - } - -} diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ChainParameters.java b/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ChainParameters.java deleted file mode 100644 index 5b074cc57c..0000000000 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ChainParameters.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.protocol.model; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.base.basic.NulsOutputStreamBuffer; -import io.nuls.base.data.BaseNulsData; -import io.nuls.core.exception.NulsException; -import io.nuls.core.parse.SerializeUtils; - -import java.io.IOException; - -/** - * 链的运行时参数 - * - * @author captain - * @version 1.0 - * @date 19-2-26 上午10:49 - */ -public class ChainParameters extends BaseNulsData { - - /** - * 链ID - */ - private int chainId; - /** - * 日志级别 - */ - private String logLevel; - - /** - * 统计区间 - */ - private short interval; - /** - * 每个统计区间内的最小生效比例 - */ - private byte effectiveRatioMinimum; - /** - * 协议生效要满足的连续区间数最小值 - */ - private short continuousIntervalCountMinimum; - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public String getLogLevel() { - return logLevel; - } - - public void setLogLevel(String logLevel) { - this.logLevel = logLevel; - } - - public short getInterval() { - return interval; - } - - public void setInterval(short interval) { - this.interval = interval; - } - - public byte getEffectiveRatioMinimum() { - return effectiveRatioMinimum; - } - - public void setEffectiveRatioMinimum(byte effectiveRatioMinimum) { - this.effectiveRatioMinimum = effectiveRatioMinimum; - } - - public short getContinuousIntervalCountMinimum() { - return continuousIntervalCountMinimum; - } - - public void setContinuousIntervalCountMinimum(short continuousIntervalCountMinimum) { - this.continuousIntervalCountMinimum = continuousIntervalCountMinimum; - } - - public ChainParameters() { - } - - public ChainParameters(int chainId, String logLevel, short interval, byte effectiveRatioMinimum, byte effectiveRatioMaximum, short continuousIntervalCountMaximum, short continuousIntervalCountMinimum) { - this.chainId = chainId; - this.logLevel = logLevel; - this.interval = interval; - this.effectiveRatioMinimum = effectiveRatioMinimum; - this.continuousIntervalCountMinimum = continuousIntervalCountMinimum; - } - - @Override - protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { - stream.writeUint16(chainId); - stream.writeString(logLevel); - stream.writeShort(interval); - stream.writeByte(effectiveRatioMinimum); - stream.writeShort(continuousIntervalCountMinimum); - } - - @Override - public void parse(NulsByteBuffer byteBuffer) throws NulsException { - this.chainId = byteBuffer.readUint16(); - this.logLevel = byteBuffer.readString(); - this.interval = byteBuffer.readShort(); - this.effectiveRatioMinimum = byteBuffer.readByte(); - this.continuousIntervalCountMinimum = byteBuffer.readShort(); - } - - @Override - public int size() { - int size = 7; - size += SerializeUtils.sizeOfString(logLevel); - return size; - } - - @Override - public String toString() { - return "{" + - "chainId=" + chainId + - ", logLevel='" + logLevel + '\'' + - ", interval=" + interval + - ", effectiveRatioMinimum=" + effectiveRatioMinimum + - ", continuousIntervalCountMinimum=" + continuousIntervalCountMinimum + - '}'; - } -} diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolConfig.java b/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolConfig.java deleted file mode 100644 index dc2c7272b8..0000000000 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/model/ProtocolConfig.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.protocol.model; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.core.annotation.Value; -import io.nuls.core.rpc.model.ModuleE; - -import java.io.File; - -/** - * 协议升级文件配置类 - * - * @author captain - * @version 1.0 - * @date 2019/4/23 11:01 - */ -@Component -@Configuration(domain = ModuleE.Constant.PROTOCOL_UPDATE) -public class ProtocolConfig extends ChainParameters implements ModuleConfig { - /** - * 国际化 - */ - private String language; - - @Value("dataPath") - private String dataPath; - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getDataFolder() { - return dataPath + File.separator + ModuleE.PU.name; - } -} diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/ParametersStorageService.java b/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/ParametersStorageService.java deleted file mode 100644 index 7b35617583..0000000000 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/ParametersStorageService.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.protocol.storage; - -import io.nuls.protocol.model.ChainParameters; - -import java.util.List; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author captain - * @version 1.0 - * @date 19-1-25 下午3:02 - */ -public interface ParametersStorageService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param config 配置类/config bean - * @param chainId 链ID/chain id - * @return 保存是否成功/Is preservation successful? - * @throws - */ - boolean save(ChainParameters config, int chainId); - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainId 链ID/chain id - * @return 配置信息类/config bean - */ - ChainParameters get(int chainId); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainId 链ID/chain id - * @return 删除是否成功/Delete success - */ - boolean delete(int chainId); - - /** - * 获取当前节点所有的链配置信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - */ - List getList(); - -} diff --git a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/ParametersStorageServiceImpl.java b/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/ParametersStorageServiceImpl.java deleted file mode 100644 index 3ec7747935..0000000000 --- a/module/nuls-protocol-update/src/main/java/io/nuls/protocol/storage/impl/ParametersStorageServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * - * * MIT License - * * Copyright (c) 2017-2019 nuls.io - * * Permission is hereby granted, free of charge, to any person obtaining a copy - * * of this software and associated documentation files (the "Software"), to deal - * * in the Software without restriction, including without limitation the rights - * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * * copies of the Software, and to permit persons to whom the Software is - * * furnished to do so, subject to the following conditions: - * * The above copyright notice and this permission notice shall be included in all - * * copies or substantial portions of the Software. - * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * * SOFTWARE. - * - */ - -package io.nuls.protocol.storage.impl; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.protocol.constant.Constant; -import io.nuls.protocol.manager.ContextManager; -import io.nuls.protocol.model.ChainParameters; -import io.nuls.protocol.storage.ParametersStorageService; - -import java.util.ArrayList; -import java.util.List; - -import static io.nuls.protocol.utils.LoggerUtil.COMMON_LOG; - -/** - * 参数持久化类实现 - * - * @author captain - * @version 1.0 - * @date 2019/4/23 11:02 - */ -@Component -public class ParametersStorageServiceImpl implements ParametersStorageService { - @Override - public boolean save(ChainParameters parameters, int chainId) { - byte[] bytes; - try { - bytes = parameters.serialize(); - return RocksDBService.put(Constant.PROTOCOL_CONFIG, ByteUtils.intToBytes(chainId), bytes); - } catch (Exception e) { - ContextManager.getContext(chainId).getLogger().error(e); - return false; - } - } - - @Override - public ChainParameters get(int chainId) { - try { - ChainParameters parameters = new ChainParameters(); - byte[] bytes = RocksDBService.get(Constant.PROTOCOL_CONFIG, ByteUtils.intToBytes(chainId)); - parameters.parse(new NulsByteBuffer(bytes)); - return parameters; - } catch (Exception e) { - ContextManager.getContext(chainId).getLogger().error(e); - return null; - } - } - - @Override - public boolean delete(int chainId) { - try { - return RocksDBService.delete(Constant.PROTOCOL_CONFIG, ByteUtils.intToBytes(chainId)); - } catch (Exception e) { - ContextManager.getContext(chainId).getLogger().error(e); - return false; - } - } - - @Override - public List getList() { - try { - var pos = new ArrayList(); - List valueList = RocksDBService.valueList(Constant.PROTOCOL_CONFIG); - for (byte[] bytes : valueList) { - var parameters = new ChainParameters(); - parameters.parse(new NulsByteBuffer(bytes)); - pos.add(parameters); - } - return pos; - } catch (Exception e) { - COMMON_LOG.error(e); - return null; - } - } - -} diff --git a/module/nuls-protocol-update/src/main/resources/languages/en.properties b/module/nuls-protocol-update/src/main/resources/languages/en.properties deleted file mode 100644 index 0c6b7c841f..0000000000 --- a/module/nuls-protocol-update/src/main/resources/languages/en.properties +++ /dev/null @@ -1,2 +0,0 @@ -pu_0001=protocol update module save block error -pu_0002=protocol update module rollback block error \ No newline at end of file diff --git a/module/nuls-protocol-update/src/main/resources/module.json b/module/nuls-protocol-update/src/main/resources/module.json deleted file mode 100644 index 712f078098..0000000000 --- a/module/nuls-protocol-update/src/main/resources/module.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "interval": 10, - "effectiveRatioMinimum": 60, - "continuousIntervalCountMinimum": 10 -} \ No newline at end of file diff --git a/module/nuls-smart-contract/module.ncf b/module/nuls-smart-contract/module.ncf deleted file mode 100644 index 3d5d667bdc..0000000000 --- a/module/nuls-smart-contract/module.ncf +++ /dev/null @@ -1,15 +0,0 @@ -[JAVA] -APP_NAME=smart-contract -MAIN_CLASS=io.nuls.contract.SmartContractBootStrap -VERSION=1.0.0 -JOPT_XMS=3072 -JOPT_XMX=3072 -JAVA_OPTS=-XX:NewRatio=2 - -[Core] -Managed=1 - -[smart-contract] -moduleDynamicDependent=protocol-update - - diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractConfig.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractConfig.java deleted file mode 100644 index d43c4653b3..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/config/ContractConfig.java +++ /dev/null @@ -1,171 +0,0 @@ -/** - * MIT License - *

- * Copyright (c) 2017-2019 nuls.io - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - *

- * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.contract.config; - -import io.nuls.contract.model.bo.config.ConfigBean; -import io.nuls.contract.tx.SmartContractVersionChangeInvoker; -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.basic.VersionChangeInvoker; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; - -import java.lang.reflect.InvocationTargetException; - -/** - * @author: PierreLuo - * @date: 2019-03-15 - */ -@Component -@Configuration(domain = ModuleE.Constant.SMART_CONTRACT) -public class ContractConfig implements ModuleConfig { - /** - * 编码方式 - */ - private String encoding; - - private int mainChainId; - - private int mainAssetId; - - /** - * ROCK DB 数据库文件存储路径 - */ - private String dataPath; - - private int chainId; - - private int assetId; - - private long maxViewGas; - - private String packageLogPackages; - - private String packageLogLevels; - - private String blackHolePublicKey; - - private String crossTokenSystemContract; - - public String getCrossTokenSystemContract() { - return crossTokenSystemContract; - } - - public void setCrossTokenSystemContract(String crossTokenSystemContract) { - this.crossTokenSystemContract = crossTokenSystemContract; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public long getMaxViewGas() { - return maxViewGas; - } - - public void setMaxViewGas(long maxViewGas) { - this.maxViewGas = maxViewGas; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public int getMainChainId() { - return mainChainId; - } - - public void setMainChainId(int mainChainId) { - this.mainChainId = mainChainId; - } - - public int getMainAssetId() { - return mainAssetId; - } - - public void setMainAssetId(int mainAssetId) { - this.mainAssetId = mainAssetId; - } - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getPackageLogPackages() { - return packageLogPackages; - } - - public void setPackageLogPackages(String packageLogPackages) { - this.packageLogPackages = packageLogPackages; - } - - public String getPackageLogLevels() { - return packageLogLevels; - } - - public void setPackageLogLevels(String packageLogLevels) { - this.packageLogLevels = packageLogLevels; - } - - public String getBlackHolePublicKey() { - return blackHolePublicKey; - } - - public void setBlackHolePublicKey(String blackHolePublicKey) { - this.blackHolePublicKey = blackHolePublicKey; - } - - public ConfigBean getChainConfig() { - ConfigBean configBean = new ConfigBean(); - configBean.setAssetId(assetId); - configBean.setChainId(chainId); - configBean.setMaxViewGas(maxViewGas); - return configBean; - } - - @Override - public VersionChangeInvoker getVersionChangeInvoker() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - return SmartContractVersionChangeInvoker.instance(); - } -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java deleted file mode 100644 index cb542cdcc1..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/manager/ContractTokenBalanceManager.java +++ /dev/null @@ -1,224 +0,0 @@ -/** - * MIT License - *

- * Copyright (c) 2017-2019 nuls.io - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - *

- * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package io.nuls.contract.manager; - -import io.nuls.base.basic.AddressTool; -import io.nuls.base.data.BlockHeader; -import io.nuls.contract.constant.ContractErrorCode; -import io.nuls.contract.helper.ContractHelper; -import io.nuls.contract.model.bo.ContractTokenInfo; -import io.nuls.contract.model.po.ContractAddressInfoPo; -import io.nuls.contract.rpc.call.BlockCall; -import io.nuls.contract.storage.ContractTokenAddressStorageService; -import io.nuls.core.basic.Result; -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.core.exception.NulsException; - -import java.math.BigInteger; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import static io.nuls.contract.constant.ContractErrorCode.ADDRESS_ERROR; -import static io.nuls.contract.util.ContractUtil.getSuccess; - -/** - * @author: PierreLuo - * @date: 2019-03-08 - */ -public class ContractTokenBalanceManager { - - private ContractHelper contractHelper; - - private ContractTokenAddressStorageService contractTokenAddressStorageService; - - private int chainId; - - /** - * key: String - local account address - * value: - * key: String - contract address - * value: ContractTokenInfo - token name && amount - */ - private Map> contractTokenOfLocalAccount = new ConcurrentHashMap<>(); - - private Lock tokenLock = new ReentrantLock(); - - private Set initializedAddressSet; - - public static ContractTokenBalanceManager newInstance(int chainId) { - ContractTokenBalanceManager manager = new ContractTokenBalanceManager(); - manager.chainId = chainId; - manager.contractHelper = SpringLiteContext.getBean(ContractHelper.class); - manager.contractTokenAddressStorageService = SpringLiteContext.getBean(ContractTokenAddressStorageService.class); - manager.initializedAddressSet = ConcurrentHashMap.newKeySet(); - return manager; - } - - private ContractTokenBalanceManager() { - } - - public Result initAllTokensByImportAccount(String account) throws NulsException { - initializedAddressSet.remove(account); - return this.initAllTokensByAccount(account); - } - - private Result initAllTokensByAccount(String account) throws NulsException { - if (!initializedAddressSet.add(account)) { - return getSuccess(); - } - if (!AddressTool.validAddress(chainId, account)) { - return Result.getFailed(ADDRESS_ERROR); - } - Result> allNrc20ListResult = contractTokenAddressStorageService.getAllNrc20AddressList(chainId); - if (allNrc20ListResult.isFailed()) { - return allNrc20ListResult; - } - BlockHeader blockHeader = BlockCall.getLatestBlockHeader(chainId); - List contractAddressInfoPoList = allNrc20ListResult.getData(); - for (byte[] address : contractAddressInfoPoList) { - initialContractToken(account, blockHeader, AddressTool.getStringAddressByBytes(address)); - } - - return getSuccess(); - } - - public void initialContractToken(String account, BlockHeader blockHeader, String contract) { - tokenLock.lock(); - try { - Result result = contractHelper.getContractToken(chainId, blockHeader, account, contract); - if (result.isFailed()) { - return; - } - ContractTokenInfo tokenInfo = result.getData(); - BigInteger amount = tokenInfo.getAmount(); - if (amount == null || amount.equals(BigInteger.ZERO)) { - return; - } - Map tokens = contractTokenOfLocalAccount.get(account); - if (tokens == null) { - tokens = new HashMap<>(); - } - tokens.put(contract, tokenInfo); - contractTokenOfLocalAccount.put(account, tokens); - } finally { - tokenLock.unlock(); - } - } - - public void refreshContractToken(String account, String contract, ContractAddressInfoPo po, BigInteger value) { - tokenLock.lock(); - try { - ContractTokenInfo tokenInfo = new ContractTokenInfo(contract, po.getNrc20TokenName(), po.getDecimals(), value, po.getNrc20TokenSymbol(), po.getBlockHeight()); - Map tokens = contractTokenOfLocalAccount.get(account); - if (tokens == null) { - tokens = new HashMap<>(); - } - tokens.put(contract, tokenInfo); - contractTokenOfLocalAccount.put(account, tokens); - } finally { - tokenLock.unlock(); - } - } - - public Result> getAllTokensByAccount(String account) throws NulsException { - Result result = this.initAllTokensByAccount(account); - if (result.isFailed()) { - return result; - } - Map tokensMap = contractTokenOfLocalAccount.get(account); - if (tokensMap == null || tokensMap.size() == 0) { - return getSuccess().setData(new ArrayList<>()); - } - List resultList = new ArrayList<>(); - Set> entries = tokensMap.entrySet(); - String contractAddress; - ContractTokenInfo info; - for (Map.Entry entry : entries) { - contractAddress = entry.getKey(); - info = entry.getValue(); - info.setContractAddress(contractAddress); - resultList.add(info); - } - return getSuccess().setData(resultList); - } - - - public Result subtractContractToken(String account, String contract, BigInteger token) { - tokenLock.lock(); - try { - Map tokens = contractTokenOfLocalAccount.get(account); - if (tokens == null) { - return getSuccess(); - } else { - ContractTokenInfo info = tokens.get(contract); - if (info == null) { - return getSuccess(); - } - BigInteger currentToken = info.getAmount(); - if (currentToken == null) { - return getSuccess(); - } else { - if (currentToken.compareTo(token) < 0) { - return Result.getFailed(ContractErrorCode.INSUFFICIENT_TOKEN_BALANCE); - } - currentToken = currentToken.subtract(token); - tokens.put(contract, info.setAmount(currentToken)); - } - } - return getSuccess(); - } finally { - tokenLock.unlock(); - } - } - - public Result addContractToken(String account, String contract, BigInteger token) { - tokenLock.lock(); - try { - Map tokens = contractTokenOfLocalAccount.get(account); - do { - if (tokens == null) { - break; - } else { - ContractTokenInfo info = tokens.get(contract); - if (info == null) { - return getSuccess(); - } - BigInteger currentToken = info.getAmount(); - if (currentToken == null) { - break; - } else { - currentToken = currentToken.add(token); - tokens.put(contract, info.setAmount(currentToken)); - } - } - } while (false); - } finally { - tokenLock.unlock(); - } - return getSuccess(); - } - -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigBean.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigBean.java deleted file mode 100644 index d487f25673..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/model/bo/config/ConfigBean.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.contract.model.bo.config; - -import java.io.Serializable; - -/** - * 模块配置类 - * Module Configuration Class - * - * @author: PierreLuo - * @date: 2019-02-26 - */ -public class ConfigBean implements Serializable { - /** - * 资产ID - * assets id - */ - private int assetId; - - /** - * chain id - */ - private int chainId; - - /** - * view方法最大消耗gas - */ - private long maxViewGas; - - public ConfigBean() { - } - - public ConfigBean(int assetsId, int chainId, long maxViewGas) { - this.assetId = assetsId; - this.chainId = chainId; - this.maxViewGas = maxViewGas; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public long getMaxViewGas() { - return maxViewGas; - } - - public void setMaxViewGas(long maxViewGas) { - this.maxViewGas = maxViewGas; - } -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ConfigStorageService.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ConfigStorageService.java deleted file mode 100644 index 5420ba8f5e..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ConfigStorageService.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.contract.storage; - - -import io.nuls.contract.model.bo.config.ConfigBean; - -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author qinyifeng - * @date 2018/12/11 - */ -public interface ConfigStorageService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param bean 配置类/config bean - * @param chainID 链ID/chain id - * @return 保存是否成功/Is preservation successful? - * @throws - */ - boolean save(ConfigBean bean, int chainID) throws Exception; - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainID 链ID/chain id - * @return 配置信息类/config bean - */ - ConfigBean get(int chainID); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainID 链ID/chain id - * @return 删除是否成功/Delete success - */ - boolean delete(int chainID); - - /** - * 获取当前节点所有的链信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - */ - Map getList(); -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenAddressStorageService.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenAddressStorageService.java deleted file mode 100644 index f4c9a7ce86..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/ContractTokenAddressStorageService.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.contract.storage; - - -import io.nuls.core.basic.Result; - -import java.util.List; - -/** - * @author: PierreLuo - * @date: 2019-03-11 - */ -public interface ContractTokenAddressStorageService { - - /** - * 保存合约地址 - * - * @param account - * @param hash - * @return - */ - Result saveTokenAddress(int chainId, byte[] contractAddressBytes) throws Exception; - - - /** - * 删除合约地址 - * - * @param contractAddressBytes - * @return - */ - Result deleteTokenAddress(int chainId, byte[] contractAddressBytes) throws Exception; - - /** - * 根据地址检查是否存在这个合约地址 - * - * @param contractAddressBytes - * @return - */ - boolean isExistTokenAddress(int chainId, byte[] contractAddressBytes); - - /** - * 获取全网所有Nrc20合约 - * - * @return - */ - Result> getAllNrc20AddressList(int chainId); -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ConfigStorageServiceImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ConfigStorageServiceImpl.java deleted file mode 100644 index 686b20c4ba..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ConfigStorageServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.contract.storage.impl; - -import io.nuls.contract.constant.ContractDBConstant; -import io.nuls.contract.model.bo.config.ConfigBean; -import io.nuls.contract.storage.ConfigStorageService; -import io.nuls.contract.util.Log; -import io.nuls.core.rockdb.model.Entry; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.model.ObjectUtils; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author qinyifeng - * @date 2018/12/11 - */ -@Component -public class ConfigStorageServiceImpl implements ConfigStorageService { - - - @Override - public boolean save(ConfigBean bean, int chainID) throws Exception { - if (bean == null) { - return false; - } - return RocksDBService.put(ContractDBConstant.DB_NAME_CONGIF, ByteUtils.intToBytes(chainID), ObjectUtils.objectToBytes(bean)); - } - - @Override - public ConfigBean get(int chainID) { - try { - byte[] value = RocksDBService.get(ContractDBConstant.DB_NAME_CONGIF, ByteUtils.intToBytes(chainID)); - return ObjectUtils.bytesToObject(value); - } catch (Exception e) { - Log.error(e); - return null; - } - } - - @Override - public boolean delete(int chainID) { - try { - return RocksDBService.delete(ContractDBConstant.DB_NAME_CONGIF, ByteUtils.intToBytes(chainID)); - } catch (Exception e) { - Log.error(e); - return false; - } - } - - @Override - public Map getList() { - try { - List> list = RocksDBService.entryList(ContractDBConstant.DB_NAME_CONGIF); - Map configBeanMap = new HashMap<>(8); - for (Entry entry : list) { - int key = ByteUtils.bytesToInt(entry.getKey()); - ConfigBean value = ObjectUtils.bytesToObject(entry.getValue()); - configBeanMap.put(key, value); - } - return configBeanMap; - } catch (Exception e) { - Log.error(e); - return null; - } - } -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenAddressStorageServiceImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenAddressStorageServiceImpl.java deleted file mode 100644 index 13fdb6228c..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenAddressStorageServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.contract.storage.impl; - - -import io.nuls.contract.constant.ContractErrorCode; -import io.nuls.contract.storage.ContractTokenAddressStorageService; -import io.nuls.contract.util.ContractUtil; -import io.nuls.core.basic.Result; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.rockdb.service.RocksDBService; - -import java.util.List; - -import static io.nuls.contract.constant.ContractDBConstant.DB_NAME_CONTRACT_NRC20_TOKEN_ADDRESS; - -/** - * @author: PierreLuo - * @date: 2019-03-11 - */ -@Component -public class ContractTokenAddressStorageServiceImpl implements ContractTokenAddressStorageService { - - private static final byte[] EMPTY = new byte[]{0}; - - private final String baseArea = DB_NAME_CONTRACT_NRC20_TOKEN_ADDRESS + "_"; - - @Override - public Result saveTokenAddress(int chainId, byte[] contractAddressBytes) throws Exception { - if (contractAddressBytes == null) { - return Result.getFailed(ContractErrorCode.NULL_PARAMETER); - } - boolean result = RocksDBService.put(baseArea + chainId, contractAddressBytes, EMPTY); - if (result) { - return ContractUtil.getSuccess(); - } else { - return ContractUtil.getFailed(); - } - } - - - @Override - public Result deleteTokenAddress(int chainId, byte[] contractAddressBytes) throws Exception { - if (contractAddressBytes == null) { - return Result.getFailed(ContractErrorCode.NULL_PARAMETER); - } - boolean result = RocksDBService.delete(baseArea + chainId, contractAddressBytes); - if (result) { - return ContractUtil.getSuccess(); - } else { - return ContractUtil.getFailed(); - } - } - - @Override - public boolean isExistTokenAddress(int chainId, byte[] contractAddressBytes) { - if (contractAddressBytes == null) { - return false; - } - byte[] contract = RocksDBService.get(baseArea + chainId, contractAddressBytes); - if (contract == null) { - return false; - } - return true; - } - - @Override - public Result> getAllNrc20AddressList(int chainId) { - List list = RocksDBService.keyList(baseArea + chainId); - if (list == null || list.size() == 0) { - return Result.getFailed(ContractErrorCode.DATA_NOT_FOUND); - } - Result> result = ContractUtil.getSuccess(); - result.setData(list); - return result; - } - -} diff --git a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenTransferStorageServiceImpl.java b/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenTransferStorageServiceImpl.java deleted file mode 100644 index 2c8224fd3c..0000000000 --- a/module/nuls-smart-contract/src/main/java/io/nuls/contract/storage/impl/ContractTokenTransferStorageServiceImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.contract.storage.impl; - - -import io.nuls.base.data.Address; -import io.nuls.contract.model.po.ContractTokenTransferInfoPo; -import io.nuls.contract.storage.ContractTokenTransferStorageService; -import io.nuls.core.basic.Result; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.rockdb.model.Entry; -import io.nuls.core.rockdb.service.RocksDBService; - -import java.util.ArrayList; -import java.util.List; - -import static io.nuls.contract.constant.ContractDBConstant.DB_NAME_CONTRACT_NRC20_TOKEN_TRANSFER; -import static io.nuls.contract.util.ContractDBUtil.getModel; -import static io.nuls.contract.util.ContractDBUtil.putModel; -import static io.nuls.contract.util.ContractUtil.getFailed; -import static io.nuls.contract.util.ContractUtil.getSuccess; - -/** - * @author: PierreLuo - * @date: 2018/6/5 - */ -@Component -public class ContractTokenTransferStorageServiceImpl implements ContractTokenTransferStorageService { - - private final String baseArea = DB_NAME_CONTRACT_NRC20_TOKEN_TRANSFER + "_"; - - @Override - public Result saveTokenTransferInfo(int chainId, byte[] infoKey, ContractTokenTransferInfoPo infoPo) { - boolean result = putModel(baseArea + chainId, infoKey, infoPo); - if (result) { - return getSuccess(); - } else { - return getFailed(); - } - } - - @Override - public List getTokenTransferInfoListByAddress(int chainId, byte[] address) { - List infoPoList = new ArrayList<>(); - List> entryList = RocksDBService.entryList(baseArea + chainId); - if (entryList == null || entryList.isEmpty()) { - return infoPoList; - } - - ContractTokenTransferInfoPo tokenTransferInfoPo; - for (Entry entry : entryList) { - if (isAddressEquals(entry.getKey(), address)) { - tokenTransferInfoPo = getModel(entry.getValue(), ContractTokenTransferInfoPo.class); - infoPoList.add(tokenTransferInfoPo); - } - } - return infoPoList; - } - - private boolean isAddressEquals(byte[] key, byte[] address) { - int length = Address.ADDRESS_LENGTH; - for (int i = 0; i < length; i++) { - if (key[i] != address[i]) { - return false; - } - } - return true; - } - - @Override - public List getTokenTransferInfoListByAddress(int chainId, byte[] address, byte[] txHash) { - List infoPoList = new ArrayList<>(); - List> entryList = RocksDBService.entryList(baseArea + chainId); - if (entryList == null || entryList.isEmpty()) { - return infoPoList; - } - - ContractTokenTransferInfoPo tokenTransferInfoPo; - for (Entry entry : entryList) { - if (isAddressAndHashEquals(entry.getKey(), address, txHash)) { - tokenTransferInfoPo = getModel(entry.getValue(), ContractTokenTransferInfoPo.class); - infoPoList.add(tokenTransferInfoPo); - } - } - return infoPoList; - } - - private boolean isAddressAndHashEquals(byte[] key, byte[] address, byte[] txHash) { - int length = Address.ADDRESS_LENGTH + txHash.length; - for (int i = 0, k = 0; i < length; i++) { - if (i < Address.ADDRESS_LENGTH) { - if (key[i] != address[i]) { - return false; - } - } else { - if (key[i] != txHash[k++]) { - return false; - } - } - } - return true; - } - - @Override - public Result deleteTokenTransferInfo(int chainId, byte[] infoKey) throws Exception { - boolean result = RocksDBService.delete(baseArea + chainId, infoKey); - if (result) { - return getSuccess(); - } else { - return getFailed(); - } - } - - @Override - public Result getTokenTransferInfo(int chainId, byte[] infoKey) { - ContractTokenTransferInfoPo tokenTransferInfoPo = getModel(baseArea + chainId, infoKey, ContractTokenTransferInfoPo.class); - Result result = getSuccess(); - result.setData(tokenTransferInfoPo); - return result; - } -} diff --git a/module/nuls-smart-contract/src/main/resources/languages/en.properties b/module/nuls-smart-contract/src/main/resources/languages/en.properties deleted file mode 100644 index 3d841f7def..0000000000 --- a/module/nuls-smart-contract/src/main/resources/languages/en.properties +++ /dev/null @@ -1,53 +0,0 @@ -sc_0001=Contract execute error -sc_0002=Contract address does not exist -sc_0003=Create contract tx error -sc_0004=Illegal contract address -sc_0005=Non-contractual transaction -sc_0006=Funds for non-contractual transaction cannot be transferred to the contract address -sc_0007=The format of the name is incorrect. -sc_0008=Non-NRC20 contract -sc_0009=Non-view method -sc_0010=Illegal contract code -sc_0011=Duplicate token name -sc_0012=The format of the symbol is incorrect. -sc_0013=Contract Locked -sc_0014=The value of decimals ranges from 0 to 18 -sc_0015=The value of totalSupply ranges from 1 to 2^256 - 1 -sc_0016=The gas price is error -sc_0017=Cannot delete contract when balance is not 0 -sc_0018=The contract deleter must be the contract creator -sc_0019=The contract has been deleted -sc_0020=Exceeded the maximum GAS limit for contract calls -sc_0021=Do not execute view methods -sc_0022=This contract does not accept direct transfers -sc_0023=Contract method does not exist -sc_0024=Transfer amount cannot be locked. -sc_0025=Insufficient balance to transfer to the contract address. -sc_0026=The contract creator is not the transaction creator. -sc_0027=The contract caller is not the transaction creator. -sc_0028=The contract deleter is not the transaction creator. -sc_0029=The contract deleter is not the contract creator. -sc_0030=That balance of the contract is abnormal. -sc_0031=The receiver is not the contract address. -sc_0032=Insufficient token balance -sc_0033=Different modules registered duplicate cmd -sc_0034=The type of NEW_TX does not support non-string array return values -sc_0035=Illegal operation, cannot transfer token, cannot send events, cannot transfer internally, cannot call contracts internally, cannot generate new transactions -sc_0036=The value of gas limit ranges from 25 to 10,000,000 -sc_0037=The chain id or assets id of coin is error. -sc_0038=The contract coin to is not empty. -sc_0039=The contract alias format error. -sc_0040=Duplicate transaction of contract return gas. -sc_0041=Illegal coinTo in the contract. -sc_0042=Illegal coinFrom in the contract. -sc_0043=The contract caller is not the transaction signer. - -sc_0100=Insufficient balance -sc_0101=Transaction fee is not right -sc_0102=The amount of the transfer is too small -sc_0103=Transaction is not exist -sc_0104=Password is wrong -sc_0105=Account does not exist -sc_0106=Address wrong - -sc_9999=Contract unknown error \ No newline at end of file diff --git a/module/nuls-smart-contract/src/main/resources/module.json b/module/nuls-smart-contract/src/main/resources/module.json deleted file mode 100644 index 3b28570502..0000000000 --- a/module/nuls-smart-contract/src/main/resources/module.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "chainId": 1, - "assetId": 1, - "maxViewGas": 100000000, - "mainChainId": 1, - "mainAssetId": 1, - "encoding": "UTF-8", - "packageLogPackages": "io.nuls.contract.vm.program.impl.ProgramExecutorImpl,db,rlp,general", - "packageLogLevels": "INFO,INFO,INFO,INFO" -} \ No newline at end of file diff --git a/module/nuls-smart-contract/src/main/resources/protocol-config.json b/module/nuls-smart-contract/src/main/resources/protocol-config.json deleted file mode 100644 index 58f2b73187..0000000000 --- a/module/nuls-smart-contract/src/main/resources/protocol-config.json +++ /dev/null @@ -1,168 +0,0 @@ -[ - { - "version": "16", - "extend": "14", - "validTxs": [ - { - "type": "15", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CreateContractProcessorV16" - }, - { - "type": "16", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CallContractProcessorV16" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "14", - "extend": "13", - "validTxs": [ - { - "type": "15", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CreateContractProcessorV14" - }, - { - "type": "16", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CallContractProcessorV14" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "13", - "extend": "8", - "validTxs": [ - { - "type": "16", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CallContractProcessorV13" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "8", - "extend": "4", - "validTxs": [ - { - "type": "15", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CreateContractProcessorV8" - }, - { - "type": "16", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CallContractProcessorV8" - }, - { - "type": "17", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "DeleteContractProcessorV8" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "4", - "extend": "1", - "validTxs": [ - { - "type": "19", - "systemTx": true, - "unlockTx": false, - "verifyFee": true, - "verifySignature": false, - "handler": "ContractReturnGasProcessor" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - }, - { - "version": "1", - "extend": "", - "validTxs": [ - { - "type": "15", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CreateContractProcessor" - }, - { - "type": "16", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "CallContractProcessor" - }, - { - "type": "17", - "systemTx": false, - "unlockTx": false, - "verifySignature": true, - "verifyFee": true, - "handler": "DeleteContractProcessor" - }, - { - "type": "18", - "systemTx": true, - "unlockTx": false, - "verifyFee": true, - "verifySignature": false, - "handler": "" - }, - { - "type": "19", - "systemTx": true, - "unlockTx": false, - "verifyFee": true, - "verifySignature": false, - "handler": "" - } - ], - "validMsgs": [], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-transaction/module.ncf b/module/nuls-transaction/module.ncf deleted file mode 100644 index e10cd8e77e..0000000000 --- a/module/nuls-transaction/module.ncf +++ /dev/null @@ -1,13 +0,0 @@ -[JAVA] -APP_NAME=transaction -MAIN_CLASS=io.nuls.transaction.TransactionBootstrap -VERSION=1.0.0 -JOPT_XMS=256 -JOPT_XMX=512 - - -[Core] -Managed=1 - -[transaction] -moduleDynamicDependent=protocol-update,smart-contract diff --git a/module/nuls-transaction/pom.xml b/module/nuls-transaction/pom.xml deleted file mode 100644 index 33f73027bd..0000000000 --- a/module/nuls-transaction/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - io.nuls.v2 - module - 1.0.0-SNAPSHOT - - nuls-transaction - - - - com.google.code.gson - gson - 2.8.9 - test - - - io.nuls.v2 - nuls-base-protocol-update - - - - - nuls-transaction - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - - - - - \ No newline at end of file diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java deleted file mode 100644 index 6884d78a96..0000000000 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/constant/TxConfig.java +++ /dev/null @@ -1,135 +0,0 @@ -package io.nuls.transaction.constant; - -import io.nuls.core.basic.ModuleConfig; -import io.nuls.core.basic.VersionChangeInvoker; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.core.annotation.Configuration; -import io.nuls.core.rpc.model.ModuleE; -import io.nuls.transaction.model.bo.config.ConfigBean; - -import java.io.File; -import java.lang.reflect.InvocationTargetException; - -/** - * Transaction module setting - * @author: Charlie - * @date: 2019/03/14 - */ -@Component -@Configuration(domain = ModuleE.Constant.TRANSACTION) -public class TxConfig extends ConfigBean implements ModuleConfig { - /** - * ROCK DB 数据库文件存储路径 - */ - private String dataPath; - /** 模块code*/ - private String moduleCode; - /** 主链链ID*/ - private int mainChainId; - /** 主链主资产ID*/ - private int mainAssetId; - /** 编码*/ - private String encoding; - /** 未确认交易过期时间秒 */ - private long unconfirmedTxExpire; - private String blackHolePublicKey; - - private String blackListPath; - private String accountBlockManagerPublicKeys; - - public String getAccountBlockManagerPublicKeys() { - return accountBlockManagerPublicKeys; - } - - public void setAccountBlockManagerPublicKeys(String accountBlockManagerPublicKeys) { - this.accountBlockManagerPublicKeys = accountBlockManagerPublicKeys; - } - - public String getBlackListPath() { - return blackListPath; - } - - public void setBlackListPath(String blackListPath) { - this.blackListPath = blackListPath; - } - - public String getBlackHolePublicKey() { - return blackHolePublicKey; - } - - public void setBlackHolePublicKey(String blackHolePublicKey) { - this.blackHolePublicKey = blackHolePublicKey; - } - // add by pierre at 2019-12-04 - /** - * 是否已连接智能合约模块 - */ - private volatile boolean collectedSmartContractModule; - - public boolean isCollectedSmartContractModule() { - return collectedSmartContractModule; - } - - public void setCollectedSmartContractModule(boolean collectedSmartContractModule) { - this.collectedSmartContractModule = collectedSmartContractModule; - } - // end code by pierre - - public String getDataPath() { - return dataPath; - } - - public void setDataPath(String dataPath) { - this.dataPath = dataPath; - } - - public String getTxDataRoot() { - return dataPath + File.separator + ModuleE.TX.name; - } - - public String getModuleCode() { - return moduleCode; - } - - public void setModuleCode(String moduleCode) { - this.moduleCode = moduleCode; - } - - public int getMainChainId() { - return mainChainId; - } - - public void setMainChainId(int mainChainId) { - this.mainChainId = mainChainId; - } - - public int getMainAssetId() { - return mainAssetId; - } - - public void setMainAssetId(int mainAssetId) { - this.mainAssetId = mainAssetId; - } - - public String getEncoding() { - return encoding; - } - - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public long getUnconfirmedTxExpire() { - return unconfirmedTxExpire; - } - - public void setUnconfirmedTxExpire(long unconfirmedTxExpire) { - this.unconfirmedTxExpire = unconfirmedTxExpire; - } - - @Override - public VersionChangeInvoker getVersionChangeInvoker() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - Class aClass = Class.forName("io.nuls.transaction.rpc.upgrade.TxVersionChangeInvoker"); - return (VersionChangeInvoker) aClass.getDeclaredConstructor().newInstance(); - } -} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigBean.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigBean.java deleted file mode 100644 index 0e7d90c439..0000000000 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigBean.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.transaction.model.bo.config; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.base.basic.NulsOutputStreamBuffer; -import io.nuls.base.data.BaseNulsData; -import io.nuls.core.exception.NulsException; -import io.nuls.core.parse.SerializeUtils; - -import java.io.IOException; - -/** - * Transaction module chain setting - * @author: Charlie - * @date: 2019/03/14 - */ - -public class ConfigBean extends BaseNulsData { - - /** chain id*/ - private int chainId; - /** assets id*/ - private int assetId; - /** 单个交易数据最大值(B)*/ - private long txMaxSize; - /** - * 打包时在获取交易之后留给模块统一验证的时间阈值, - * 包括统一验证有被过滤掉的交易时需要重新验证等. - */ - private int moduleVerifyPercent; - /** 打包获取交易给RPC传输到共识的预留时间,超时则需要处理交易还原待打包队列*/ - private int packageRpcReserveTime; - /** 接收网络新交易队列的最大容量 未处理的交易队列**/ - private long txUnverifiedQueueSize; - /** 孤儿交易生命时间,超过会被清理**/ - private int orphanTtl; - - @Override - protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException { - stream.writeUint16(chainId); - stream.writeUint16(assetId); - stream.writeUint32(txMaxSize); - stream.writeUint16(moduleVerifyPercent); - stream.writeUint16(packageRpcReserveTime); - stream.writeUint32(txUnverifiedQueueSize); - stream.writeUint16(orphanTtl); - } - - @Override - public void parse(NulsByteBuffer byteBuffer) throws NulsException { - this.chainId = byteBuffer.readUint16(); - this.assetId = byteBuffer.readUint16(); - this.txMaxSize = byteBuffer.readUint32(); - this.moduleVerifyPercent = byteBuffer.readUint16(); - this.packageRpcReserveTime = byteBuffer.readUint16(); - this.txUnverifiedQueueSize = byteBuffer.readUint32(); - this.orphanTtl = byteBuffer.readUint16(); - } - - @Override - public int size() { - int size = 5 * SerializeUtils.sizeOfUint16(); - size += 2 * SerializeUtils.sizeOfUint32(); - return size; - } - - public ConfigBean() { - } - - public ConfigBean(int chainId, int assetId, int txMaxSize, int moduleVerifyPercent, int packageRpcReserveTime, int txUnverifiedQueueSize, int orphanTtl) { - this.chainId = chainId; - this.assetId = assetId; - this.txMaxSize = txMaxSize; - this.moduleVerifyPercent = moduleVerifyPercent; - this.packageRpcReserveTime = packageRpcReserveTime; - this.txUnverifiedQueueSize = txUnverifiedQueueSize; - this.orphanTtl = orphanTtl; - } - - public int getChainId() { - return chainId; - } - - public void setChainId(int chainId) { - this.chainId = chainId; - } - - public int getAssetId() { - return assetId; - } - - public void setAssetId(int assetId) { - this.assetId = assetId; - } - - public long getTxMaxSize() { - return txMaxSize; - } - - public void setTxMaxSize(long txMaxSize) { - this.txMaxSize = txMaxSize; - } - - public int getModuleVerifyPercent() { - return moduleVerifyPercent; - } - - public void setModuleVerifyPercent(int moduleVerifyPercent) { - this.moduleVerifyPercent = moduleVerifyPercent; - } - - public int getPackageRpcReserveTime() { - return packageRpcReserveTime; - } - - public void setPackageRpcReserveTime(int packageRpcReserveTime) { - this.packageRpcReserveTime = packageRpcReserveTime; - } - - public long getTxUnverifiedQueueSize() { - return txUnverifiedQueueSize; - } - - public void setTxUnverifiedQueueSize(long txUnverifiedQueueSize) { - this.txUnverifiedQueueSize = txUnverifiedQueueSize; - } - - public int getOrphanTtl() { - return orphanTtl; - } - - public void setOrphanTtl(int orphanTtl) { - this.orphanTtl = orphanTtl; - } - -} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigItem.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigItem.java deleted file mode 100644 index 1e16795413..0000000000 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/model/bo/config/ConfigItem.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.transaction.model.bo.config; - -/** - * 配置信息类 - * Configuration information class - * - * @author qinyifeng - * @date 2018/11/11 - */ -public class ConfigItem { - private String key; - private Object value; - private boolean readOnly; - - public ConfigItem(){ - - } - public ConfigItem( Object value, boolean readOnly) { - this.value = value; - this.readOnly = readOnly; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public boolean isReadOnly() { - return readOnly; - } - - public void setReadOnly(boolean readOnly) { - this.readOnly = readOnly; - } -} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/ConfigStorageService.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/ConfigStorageService.java deleted file mode 100644 index 912d136c9a..0000000000 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/ConfigStorageService.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.transaction.storage; - -import io.nuls.transaction.model.bo.config.ConfigBean; - -import java.util.Map; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author qinyifeng - * @date 2018/12/11 - * */ -public interface ConfigStorageService { - /** - * 保存指定链的配置信息 - * Save configuration information for the specified chain - * - * @param bean 配置类/config bean - * @param chainID 链ID/chain id - * @return 保存是否成功/Is preservation successful? - * @exception - * */ - boolean save(ConfigBean bean, int chainID)throws Exception; - - /** - * 查询某条链的配置信息 - * Query the configuration information of a chain - * - * @param chainID 链ID/chain id - * @return 配置信息类/config bean - * */ - ConfigBean get(int chainID); - - /** - * 删除某条链的配置信息 - * Delete configuration information for a chain - * - * @param chainID 链ID/chain id - * @return 删除是否成功/Delete success - * */ - boolean delete(int chainID); - - /** - * 获取当前节点所有的链信息 - * Get all the chain information of the current node - * - * @return 节点信息列表/Node information list - * */ - Map getList(); -} diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/ConfigStorageServiceImpl.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/ConfigStorageServiceImpl.java deleted file mode 100644 index fabe17a323..0000000000 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/storage/impl/ConfigStorageServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017-2019 nuls.io - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -package io.nuls.transaction.storage.impl; - -import io.nuls.base.basic.NulsByteBuffer; -import io.nuls.core.core.annotation.Component; -import io.nuls.core.model.ByteUtils; -import io.nuls.core.rockdb.model.Entry; -import io.nuls.core.rockdb.service.RocksDBService; -import io.nuls.transaction.constant.TxConstant; -import io.nuls.transaction.constant.TxDBConstant; -import io.nuls.transaction.model.bo.config.ConfigBean; -import io.nuls.transaction.storage.ConfigStorageService; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static io.nuls.transaction.utils.LoggerUtil.LOG; - -/** - * 配置信息存储管理类 - * Configuration Information Storage Management Class - * - * @author qinyifeng - * @date 2018/12/11 - * */ -@Component -public class ConfigStorageServiceImpl implements ConfigStorageService { - - @Override - public boolean save(ConfigBean bean, int chainID) throws Exception{ - if(bean == null){ - return false; - } - return RocksDBService.put(TxDBConstant.DB_MODULE_CONGIF, ByteUtils.intToBytes(chainID), bean.serialize()); - } - - @Override - public ConfigBean get(int chainID) { - try { - byte[] value = RocksDBService.get(TxDBConstant.DB_MODULE_CONGIF, ByteUtils.intToBytes(chainID)); - ConfigBean configBean = new ConfigBean(); - configBean.parse(new NulsByteBuffer(value)); - return configBean; - }catch (Exception e){ - LOG.error(e); - return null; - } - } - - @Override - public boolean delete(int chainID) { - try { - return RocksDBService.delete(TxDBConstant.DB_MODULE_CONGIF,ByteUtils.intToBytes(chainID)); - }catch (Exception e){ - LOG.error(e); - return false; - } - } - - @Override - public Map getList() { - try { - List> list = RocksDBService.entryList(TxDBConstant.DB_MODULE_CONGIF); - Map configBeanMap = new HashMap<>(TxConstant.INIT_CAPACITY_2); - for (Entryentry : list) { - int key = ByteUtils.bytesToInt(entry.getKey()); - ConfigBean configBean = new ConfigBean(); - configBean.parse(new NulsByteBuffer(entry.getValue())); - configBeanMap.put(key, configBean); - } - return configBeanMap; - }catch (Exception e){ - LOG.error(e); - return null; - } - } -} diff --git a/module/nuls-transaction/src/main/resources/languages/en.properties b/module/nuls-transaction/src/main/resources/languages/en.properties deleted file mode 100644 index f3e08bfbd9..0000000000 --- a/module/nuls-transaction/src/main/resources/languages/en.properties +++ /dev/null @@ -1,44 +0,0 @@ -tx_0001=Transactions hash error -tx_0002=The coin-from address does not match the chain -tx_0003=The coin-to address does not match the chain -tx_0004=Insufficient fee -tx_0005=The asset id is error -tx_0006=CoinFrom not exist -tx_0007=CoinTo not exist -tx_0008=CoinFrom has duplicate account assets -tx_0009=CoinTo has duplicate account assets -tx_0010=CoinFroms not the same chain -tx_0011=CoinTo not the same chain -tx_0012=Transaction coinData not found -tx_0013=Transaction already exists -tx_0014=Transaction does not exist -tx_0015=Deserialize transaction error -tx_0016=Deserialize coinData error -tx_0017=The signature address of the transaction does not match the coinfrom address -tx_0018=The block height update cannot be repackaged for the rest of the time -tx_0019=Package get transactions time out -tx_0020=The chain is not found -tx_0021=Invalid(unregistered) transaction or unavailable in current version -tx_0022=Transaction data validation error -tx_0023=The transaction data is too big -tx_0024=Account is not exist -tx_0025=Transaction ledger verify fail -tx_0026=Orphan transaction -tx_0027=Repeated transaction -tx_0028=Remote response data not found -tx_0029=Transaction from cannot have contract address -tx_0030=Temporarily stop processing new transactions -tx_0031=Transaction broadcast failed -tx_0032=Send message failed -tx_0033=Invalid address -tx_0034=The minimum number of signatures for multi-signature account transactions is not reached -tx_0035=Multi-signed transaction's froms only have the same multi-signed address -tx_0036=Multi-sign account is not exist -tx_0037=Transaction verify failed -tx_0038=Contract transaction verify failed -tx_0039=The transaction was confirmed -tx_0040=System transactions cannot circulated directly through the network -tx_0041=System contract transactions cannot circulated directly through the network -tx_0042=Block Contains multiple unique transactions -tx_0043=Exist gas transactions without smart contract return transactions -tx_0044=Block address diff --git a/module/nuls-transaction/src/main/resources/module.json b/module/nuls-transaction/src/main/resources/module.json deleted file mode 100644 index ade85e1b12..0000000000 --- a/module/nuls-transaction/src/main/resources/module.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "moduleCode":"tx", - "mainChainId": 1, - "mainAssetId": 1, - "encoding": "UTF-8", - "unconfirmedTxExpire":600, - "chainId":1, - "assetId":1, - "txMaxSize":307200, - "moduleVerifyPercent":30, - "packageRpcReserveTime":100, - "txUnverifiedQueueSize":100000, - "orphanTtl":600, - "accountBlockManagerPublicKeys": "0225a6a872a4110c9b9c9a71bfdbe896e04bc83bb9fe38e27f3e18957d9b2a25ad,029f8ab66d157ddfd12d89986833eb2a8d6dc0d92c87da12225d02690583ae1020,02784d89575c16f9407c7218f8ca6c6a80d44023cd37796fc5458cbce1ede88adb,020aee2c9cde73f50c5e2eef756b92aeb138bc3cda3438b31a68b56f16004bebf8,02b2e32f94116d2364af6f06ae9af7f58824b0d3a57fca9170b1a36b665aa93195" -} \ No newline at end of file diff --git a/module/nuls-transaction/src/main/resources/protocol-config.json b/module/nuls-transaction/src/main/resources/protocol-config.json deleted file mode 100644 index 7ae458b13f..0000000000 --- a/module/nuls-transaction/src/main/resources/protocol-config.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "version": "1", - "extend": "", - "validTxs": [], - "validMsgs": [ - { - "name": "io.nuls.transaction.message.ForwardTxMessage", - "protocolCmd": "newHash", - "handlers": "ForwardTxMessageHandlerV1" - }, - { - "name": "io.nuls.transaction.message.GetTxMessage", - "protocolCmd": "askTx", - "handlers": "GetTxMessageHandlerV1" - }, - { - "name": "io.nuls.transaction.message.BroadcastTxMessage", - "protocolCmd": "receiveTx", - "handlers": "BroadcastTxMessageHandlerV1" - } - ], - "invalidTxs": "", - "invalidMsgs": "" - } -] \ No newline at end of file diff --git a/module/nuls-transaction/src/test/java/io/nuls/transaction/storage/ConfigStorageServiceTest.java b/module/nuls-transaction/src/test/java/io/nuls/transaction/storage/ConfigStorageServiceTest.java deleted file mode 100644 index 6a6b16c32b..0000000000 --- a/module/nuls-transaction/src/test/java/io/nuls/transaction/storage/ConfigStorageServiceTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.nuls.transaction.storage; - -import io.nuls.core.core.ioc.SpringLiteContext; -import io.nuls.transaction.TestConstant; -import io.nuls.transaction.TransactionBootstrap; -import io.nuls.transaction.model.bo.config.ConfigBean; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.util.Map; - -public class ConfigStorageServiceTest { - - protected static ConfigStorageService configStorageService; - protected int chainId = 2; - protected int assetsId = 1; - - @BeforeClass - public static void beforeTest() throws Exception{ - //初始化数据库配置文件 - new TransactionBootstrap().initDB(); - //初始化上下文 - SpringLiteContext.init(TestConstant.CONTEXT_PATH); - configStorageService = SpringLiteContext.getBean(ConfigStorageService.class); - } - - @Test - public void save() throws Exception { - ConfigBean bean = new ConfigBean(); - bean.setChainId(chainId); - bean.setAssetId(assetsId); - boolean result = configStorageService.save(bean, chainId); - Assert.assertTrue(result); - } - - @Test - public void get() { - ConfigBean config = configStorageService.get(chainId); - Assert.assertEquals(chainId, config.getChainId()); - } - - @Test - public void delete() { - boolean result = configStorageService.delete(chainId); - Assert.assertTrue(result); - ConfigBean config = configStorageService.get(chainId); - Assert.assertNull(config); - } - - @Test - public void getList() { - Map configMap = configStorageService.getList(); - if (configMap != null) { - for (Map.Entry entry : configMap.entrySet()) { - System.out.println(entry.getKey() + "===" + entry.getValue().getChainId()); - } - } - } - -} \ No newline at end of file diff --git a/module/pom.xml b/module/pom.xml index 2c51a47c48..e2239023ef 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -16,18 +16,19 @@ 11 - nuls-account - nuls-block - nuls-chain-manager - nuls-consensus - nuls-cross-chain - nuls-ledger - nuls-network - nuls-protocol-update - nuls-smart-contract - nuls-transaction + + + + + + + + + + nuls-cmd-client nuls-api + nuls-cores diff --git a/version b/version index 79a00e9a07..90c94814ed 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.16.0 \ No newline at end of file +2.16.2 \ No newline at end of file From df0110bd01689a03317fb1377ad16aaa8184730c Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 23 Oct 2023 15:02:27 +0800 Subject: [PATCH 14/75] Pre master (#696) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/beta (#652) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cro… * Prod 19 (#653) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ch… * Develop add api (#654) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * 提交协议升级配置 * update block * update pom * update test case * 提交12协议升级配置--允许资产重新注册跨链 * 恢复transfer * update test case * add api for block account Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/pre prod (#655) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod 1.12.1 (#656) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#657) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#658) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#659) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * 2.12.5 (#660) * 2.12.3 * 2.12.3 * 2.12.5 * Release/pre prod -- 2.13.0 (#661) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ab… * Release/pre prod (#662) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * cmd client add command (#664) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * remove dependency-fastjson --- v2.13.1 (#671) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * 2.14.0 (#674) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * 2.15.0 (#677) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Release/pre prod (#680) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#682) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Pre prod codehash (#685) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 toke… * 2.16.0 (#689) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Fix crosschain (#692) * Cross-chain transactions with a high lag of more than one day are no longer broadcast * Cross-chain transactions with a high lag of more than one day are no longer broadcast * Release/pre prod (#695) * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 * 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 * add getBalanceList (#644) * test case * V2.10.0 (#645) * beta 跨链合约更新 * verser * update beta setting * version 290 * update array list limit * update test case * update * update * update * u * update max limit * args bug * update version control * remove log * version * fix bug about nuls-api in testnet * update error log * Merge branch 'release/prod' # Conflicts: # config/nuls.ncf # module.ncf # module/nuls-api/documents/nuls-api_JSONRPC.md # module/nuls-api/documents/nuls-api_RESTFUL.md # module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java # module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java # version * v2.9.2 * add some cmds * update message to data * test file * update contract info * v2.9.3 * update contract info * v2.9.3 * fix pr 638 * update api * update ncf * add getBalanceList * test disable asset * test disable asset * test disable asset * test disable asset * test case * 通过编译 * 通过编译 * 通过编译 * 通过编译 * 通过编译 Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * Master merge 2.10.0 (#646) * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * add log trace * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * add log trace * update 3g mem of contract module * contract db query optimize * update log * remove log trace * add txType * contract db query optimize testing * update cross token system contract * 调试主网配置 * es commit * version * 优化协议版本切换逻辑 * update * support multy asset with contract in nuls api module * update offline contract transaction * add contract time out * 测试日志 * clear old cache * update * test * update * update db initial * fix bug * fix bug about conflict contract transaction * 去掉多余日志 * fix bug about setContractGenerateTxTypes * 修复本地验证人丢失的问题 * add time out * remove test code * remove test log * remove unused code * remove test code * extend transaction sync time out * beta setting * smart contract 5G mem * version * smart contract 3G mem * update config * 2.9.0 (#622) * beta 跨链合约更新 * verser * update beta setting * version 290 * update array list limit * update test case * update * update * update * u * update max limit * args bug * update version control * remove log * version Co-authored-by: MIMIEYES * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug … * Modify "Contact Us" --------- Signed-off-by: dependabot[bot] Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- README.md | 35 +++------ .../java/io/nuls/block/constant/Constant.java | 1 - .../nuls/contract/config/ContractContext.java | 1 + .../io/nuls/contract/sdk/NativeUtils.java | 18 +++++ .../src/main/resources/protocol/versions.json | 5 ++ .../io/nuls/block/BlockGeneratorTest.java | 76 ------------------- version | 2 +- 7 files changed, 34 insertions(+), 104 deletions(-) delete mode 100644 module/nuls-cores/src/test/java/io/nuls/block/BlockGeneratorTest.java diff --git a/README.md b/README.md index d804449bb3..09e2cfe356 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ ## Welcome to NULS! ## +NULS — Making It Easier To Innovate ## Introduction @@ -60,11 +61,9 @@ Note: The command will automatically end when all modules are started. Stay tuned -## Explorer and Web Wallet +## Explorer -Explorer URL: [http://beta.nulscan.io/](http://beta.nulscan.io/) - -Web Wallet: [http://beta.wallet.nuls.io/](http://beta.wallet.nuls.io/) +Explorer URL: [https://nulscan.io/](https://nulscan.io/) ## ChainBox Tutorial @@ -72,18 +71,6 @@ Please check the following documents： [https://docs.nuls.io/NULS2.0/chainBoxGuide.html](https://docs.nuls.io/NULS2.0/chainBoxGuide.html) -## Debug - -Stay tuned - -## Configuration - -Stay tuned - -## Interfaces - -Stay tuned - ## Modules Description Please check the following documents: @@ -101,15 +88,11 @@ Contributions to NULS are welcomed! We sincerely invite developers who are exper Nuls is released under the [MIT](http://opensource.org/licenses/MIT) license. Modules added in the future may be released under a different license specified in their module library path. -## Community +## Contact Us -- [nuls.io](https://nuls.io/) -- [@Twitter](https://twitter.com/nulsservice) +- [Discord](https://discord.com/invite/aRCwbj47WN/) +- [Website](https://nuls.io/) +- [Telegram](https://t.me/Nulsio/) +- [Reddit](https://www.reddit.com/r/nulsservice/) +- [Twitter](https://twitter.com/Nuls/) - [Facebook](https://www.facebook.com/nulscommunity/) -- [YouTube channel](https://www.youtube.com/channel/UC8FkLeF4QW6Undm4B3InN1Q?view_as=subscriber) -- Telegram [NULS Community](https://t.me/Nulsio) -- Telegram [NULS 中文社区](https://t.me/Nulscn) - -#### - -test diff --git a/module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java b/module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java index 695d56dea0..6f710ebc30 100644 --- a/module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java +++ b/module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java @@ -17,7 +17,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package io.nuls.block.constant; import io.nuls.base.data.Block; diff --git a/module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java b/module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java index 2ebe38ec5a..a3e19fd464 100644 --- a/module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java @@ -86,6 +86,7 @@ public class ContractContext { public static short PROTOCOL_14 = 14; public static short PROTOCOL_15 = 15; public static short PROTOCOL_16 = 16; + public static short PROTOCOL_17 = 17; private static final LoadingCache CONTRACT_INFO_CACHE; private static ContractHelper contractHelper; diff --git a/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java index fb1bfce306..37aeb292a6 100644 --- a/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java +++ b/module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java @@ -595,6 +595,12 @@ private static Result invokeExternalCmd(MethodCode methodCode, MethodArgs method String[] args = (String[]) frame.heap.getObject(argsRef); return getAddressByPublicKey(args, methodCode, frame); } + } else if ("keccak".equals(cmdName)) { + // add by pierre at 2023/10/07 p17 + if(ProtocolGroupManager.getCurrentVersion(currentChainId) >= ContractContext.PROTOCOL_17 ) { + String[] args = (String[]) frame.heap.getObject(argsRef); + return keccak(args, methodCode, frame); + } } String[] args = (String[]) frame.heap.getObject(argsRef); @@ -690,6 +696,18 @@ private static Result getCodeHash(String[] args, MethodCode methodCode, Frame fr } } + private static Result keccak(String[] args, MethodCode methodCode, Frame frame) { + try { + String hex = args[0]; + String resultStr = KeccakHash.keccak(hex); + Object resultValue = frame.heap.newString(resultStr); + Result result = NativeMethod.result(methodCode, resultValue, frame); + return result; + } catch (Exception e) { + throw new ErrorException("Invoke external cmd failed. When keccak.", frame.vm.getGasUsed(), e.getMessage()); + } + } + private static Result getAddressByPublicKey(String[] args, MethodCode methodCode, Frame frame) { try { int currentChainId = frame.vm.getProgramExecutor().getCurrentChainId(); diff --git a/module/nuls-cores/src/main/resources/protocol/versions.json b/module/nuls-cores/src/main/resources/protocol/versions.json index 595c8e227c..a8141fb11a 100644 --- a/module/nuls-cores/src/main/resources/protocol/versions.json +++ b/module/nuls-cores/src/main/resources/protocol/versions.json @@ -78,5 +78,10 @@ "version": "16", "effectiveRatio": "80", "continuousIntervalCount": "10" + }, + { + "version": "17", + "effectiveRatio": "80", + "continuousIntervalCount": "10" } ] \ No newline at end of file diff --git a/module/nuls-cores/src/test/java/io/nuls/block/BlockGeneratorTest.java b/module/nuls-cores/src/test/java/io/nuls/block/BlockGeneratorTest.java deleted file mode 100644 index da52dc09fb..0000000000 --- a/module/nuls-cores/src/test/java/io/nuls/block/BlockGeneratorTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * MIT License - * Copyright (c) 2017-2019 nuls.io - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package io.nuls.block; - -import io.nuls.base.data.Block; -import io.nuls.base.data.NulsHash; -import io.nuls.block.model.GenesisBlock; -import io.nuls.block.test.BlockGenerator; -import org.junit.Assert; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; - -public class BlockGeneratorTest { - - /** - * 测试区块生成器生成区块的连续性 - * @throws Exception - */ - @Test - public void generate() throws Exception { - int start = 1; - int count = 10; - List blocks = new ArrayList<>(); - - GenesisBlock genesisBlock = GenesisBlock.getInstance(0, 0); - blocks.add(genesisBlock); - - Block preBlock = genesisBlock; - do{ - Block block = BlockGenerator.generate(preBlock); - blocks.add(block); - preBlock = block; - start++; - } while (start < count); - - for (int i = 0; i < blocks.size()-1; i++) { - NulsHash prehash = blocks.get(i).getHeader().getHash(); - NulsHash hash = blocks.get(i+1).getHeader().getPreHash(); - Assert.assertEquals(prehash, hash); - } - } - - /** - * 测试区块生成器生成区块的分叉 - * @throws Exception - */ - @Test - public void fork() throws Exception { - Block root = BlockGenerator.generate(null); - Block block1 = BlockGenerator.generate(root, 1, "1"); - Block block2 = BlockGenerator.generate(root, 2, "1"); - Assert.assertEquals(root.getHeader().getHash(), block1.getHeader().getPreHash()); - Assert.assertEquals(block1.getHeader().getPreHash(), block2.getHeader().getPreHash()); - Assert.assertNotEquals(block1.getHeader().getHash(), block2.getHeader().getHash()); - } -} \ No newline at end of file diff --git a/version b/version index 90c94814ed..d76bd2ba3e 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.16.2 \ No newline at end of file +2.17.0 From 00748009c7128d48b8309be66d9cf7cebd8980f9 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 23 Oct 2023 15:21:57 +0800 Subject: [PATCH 15/75] Pre master (#697) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * remove vm log Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/beta (#652) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cro… * Prod 19 (#653) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ch… * Develop add api (#654) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * 提交协议升级配置 * update block * update pom * update test case * 提交12协议升级配置--允许资产重新注册跨链 * 恢复transfer * update test case * add api for block account Co-authored-by: lijunzhou Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * Release/pre prod (#655) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod 1.12.1 (#656) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#657) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#658) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#659) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * 2.12.5 (#660) * 2.12.3 * 2.12.3 * 2.12.5 * Release/pre prod -- 2.13.0 (#661) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 ab… * Release/pre prod (#662) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * cmd client add command (#664) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * remove dependency-fastjson --- v2.13.1 (#671) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 … * 2.14.0 (#674) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * 2.15.0 (#677) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Release/pre prod (#680) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Release/pre prod (#682) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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… * Pre prod codehash (#685) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 toke… * 2.16.0 (#689) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 cha… * Fix crosschain (#692) * Cross-chain transactions with a high lag of more than one day are no longer broadcast * Cross-chain transactions with a high lag of more than one day are no longer broadcast * Release/pre prod (#695) * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * update getBalanceList * fix pro bug * fix pro bug * fix pro bug * remove h2 * remove mybatis * remove mybatis * remove vm log * remove vm log * update api of token balance about locked amount * Develop (#651) * 2.6.0 merge to master (#606) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> * Bump junit from 4.12 to 4.13.1 in /common/nuls-core Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * 2.7.0 merge to master (#610) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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] * Master push (#612) * 修改chainid强转short的bug * 修复cmd依赖问题 * broad cross chain info change tx remove main chain * cross chain info change handler update * chainManager cross asset record update * 单元测试 * 修改忽略文件配置 * 修改版本号 (#600) * 修改版本号 (#601) * 2.6.0 修改协议版本号 (#602) * 修改版本号 * protocal config update Co-authored-by: tag0313 <981602228@qq.com> * 命令行支持动态执行功能 * update getblock api * update getblock api * nuls-api增加链内转平行链资产的离线交易组装接口 * 修改平行链资产小数位错误的问题。 * 修复链管理在注销资产时验证资产占比时小数位错误的问题 * 修复增加跨链资产时小数位错误的问题 * 优化网络模块连接时间服务器逻辑 * 优化网络模块连接时间服务器逻辑 * 新增可配置的起始协议号。 当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1. 修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。 * update public-service add cross tx query * fixed NPE * update public-service add cross tx query * 回滚上一个提交 * 去掉对chainid强转short * update public-service add cross tx query * update public-service add cross tx query * 增加快照功能 区块模块根据配置的高度停止保存区块。 * update public-service add cross tx query * update public-service add cross tx query * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * rm testfile * merge * merge * merge * merge * 优化release脚本 Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: Niels * merger 2.8.2 to master (#619) * api module add query Assets interface * 增加beta配置文件 * api module add query Assets interface * ps增加NRC20资产快照接口 * 修改打包配置 * 修改打包配置 * nuls-api增加链内平行链资产转账功能 * update public-service query other chainInfo * Fix a bug where you get the chainId by address * update public-service query acctTxs * 修改停止脚本。 修改手续费计算错误问题 * merge from 2.6.1-beta public service * update public service crossTxList api * update ps calc crossTx fee * update ps calc crossTx fee * update ps get cross asset info * 跨链增加查询方法 * update * update ps get cross asset info * test * update ps get cross asset info * update ps get cross asset info * update getAccountCrossLedgerList * update documents * update public-service getTxlist * update balance of contract token * update createOfflineAccount signOffline * locked balance of nrc20 * update createOfflineAccount signOffline * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * 跨链增加来源链和中间链信息 * update query ledger raking * update createOfflineAccount signOffline * 修改跨链协议 * 修改跨链协议 * 修改跨链协议 * test * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * update 3g mem of contract module * add txType * update cross token system contract * 调试主网配置 * es commit * version * support multy asset with contract in nuls api module * update offline contract transaction Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * update dependen version Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: niels1286 Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: niels1286 * 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 * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * 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 * 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 * 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 * add getBalanceList (#644) * test case * V2.10.0 (#645) * beta 跨链合约更新 * verser * update beta setting * version 290 * update array list limit * update test case * update * update * update * u * update max limit * args bug * update version control * remove log * version * fix bug about nuls-api in testnet * update error log * Merge branch 'release/prod' # Conflicts: # config/nuls.ncf # module.ncf # module/nuls-api/documents/nuls-api_JSONRPC.md # module/nuls-api/documents/nuls-api_RESTFUL.md # module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java # module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java # version * v2.9.2 * add some cmds * update message to data * test file * update contract info * v2.9.3 * update contract info * v2.9.3 * fix pr 638 * update api * update ncf * add getBalanceList * test disable asset * test disable asset * test disable asset * test disable asset * test case * 通过编译 * 通过编译 * 通过编译 * 通过编译 * 通过编译 Co-authored-by: lijun.zhou Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> * Master merge 2.10.0 (#646) * update calc totalsSupply * add crossTx transfer api * add crossTx transfer api * add crossTx transfer api * add x * update api offline.sh * locked balance of nrc20 * update ps getAssetRanking * update total balance of nrc20 in ps * account token balance * dev * 修改nerve链名称 * 修复卡块BUG * fixed npe * stop脚本 * 修改停止脚本 * 停止脚本 * update ps document * fix NPE about contract tx rollback * commit local config files * update ps coinData decimals * commit local config files * test code * commit local config files * contract database prune disabled * 跨链交易不验证签名部分 * 跨链交易验证资产是否已经注册成跨链资产 * test * add bool * update config * update config * update config * update config * add test logs * add test logs * add test logs * update ps coinData decimals * single thread pool * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * 跨链重新进行拜赞庭签名 * recovery * add boolean of contract cross asset * fix red punish bug * update ps-module getBlockTxList * update ps-module getBlockTxList * add boolean of contract cross asset * update ps-module getTxList * update ps-module getAcctTxs * 测试验证人列表异常问题 * update corsschain tx * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修复因变更跨链资产造成的平行链验证人列表重置问题。 * 修改协议号 * update disable asset * beta config * 兼容验证人恢复的交易 * 兼容验证人恢复的交易 * 配置文件 * 修复nuls-api依赖provider接口版本错误问题 * 修复nulstar在window上启动问题 * update config * update ps-module getContract * contract multi-asset transfer * contract multi-asset test and fix bug * fix bug about balance of contract * fix bug and update test case * test case updated * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * update ps-module getAccountTokenInfo * fix bug about contract transfer merge * update test case * add cmd error log * update test case * add ImportKeyStoreFilesProcessor cmd * dev * dev * fix bug about contract transfer locked * update contract call validation * update contract call validation * update module connection * optimize ledger * transaction block height update * recovery versions * update vm sdk classes * update package * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * 优化跨链交易重新处理机制 * version * update validation of contract args * fix bug * add CrossChainAssetRegMngRepository cmd * v2.7.3 * update multi-asset in contract * v2.7.3 * update package * single thread in contract * revert * update * update max count * 暂时关闭跨链交易 * 暂时关闭跨链交易 * 暂时关闭跨链交易 * support many assets transfer to contract * update vm cache settings * update setting * remove debug logs * update log * 重置本链验证人列表交易 * update data source in contract * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 重置本链验证人列表交易 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易） * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * rm * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表 * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。 * update MongoAccountServiceImpl change AddressLIst * 打开跨链交易 * update config * gas price coding * update vm class code load * update mongodb.estimatedDocumentCount() * 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。 * fix bug about contract multi-asset * 修改回滚逻辑，临时，后续需要仔细重构 * remove ps module * update contract execution way * update package logic of contract transactions * test case * 尝试修改切换分叉链失败时，区块模块停止的问题 * fix bug about multi-asset transfer into contract * update contract db and transfer * fix NPE * update memory rule in contract * update result * update contract transfer back tx * update ChainAssetCmd * 启动脚本增加动态JVM参数 * nrc721 support coding in contract module * 启动脚本增加动态JVM参数 * 调整window启动脚本 * nrc721 parse * update validation of call in nuls-api * update nuls api * fix bug about token cross chain * recovery package count (#614) * 修改协议升级的延迟块数 (#615) * update test case * add log trace * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * 重新处理跨链交易增加token跨链 * add log trace * update 3g mem of contract module * contract db query optimize * update log * remove log trace * add txType * contract db query optimize testing * update cross token system contract * 调试主网配置 * es commit * version * 优化协议版本切换逻辑 * update * support multy asset with contract in nuls api module * update offline contract transaction * add contract time out * 测试日志 * clear old cache * update * test * update * update db initial * fix bug * fix bug about conflict contract transaction * 去掉多余日志 * fix bug about setContractGenerateTxTypes * 修复本地验证人丢失的问题 * add time out * remove test code * remove test log * remove unused code * remove test code * extend transaction sync time out * beta setting * smart contract 5G mem * version * smart contract 3G mem * update config * 2.9.0 (#622) * beta 跨链合约更新 * verser * update beta setting * version 290 * update array list limit * update test case * update * update * update * u * update max limit * args bug * update version control * remove log * version Co-authored-by: MIMIEYES * 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 Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: niels1286 * Release/pre prod (#629) * update fastjson version * update dependen version * update nuls.ncf (#634) Co-authored-by: NaboxAdmin * 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 * 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 * 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 * 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 Co-authored-by: MIMIEYES Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin * fix pro bug … * Modify "Contact Us" * Modify "Contact Us" --------- Signed-off-by: dependabot[bot] Co-authored-by: zhouwei1985 <251556768@qq.com> Co-authored-by: MIMIEYES Co-authored-by: lijun.zhou Co-authored-by: Charlie <29900478@qq.com> Co-authored-by: NaboxAdmin Co-authored-by: tag0313 <981602228@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 09e2cfe356..541a89c87e 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,7 @@ NULS — Making It Easier To Innovate ## Introduction -NULS is a blockchain infrastructure -that provides customizable services -and is also a global open-source -community blockchain project. NULS -adopts micro-services to achieve a -highly modular underlying -architecture, using smart contracts -and cross-chain technologies, -combined with the ability of Chain -Factory to quickly build chains, reduce -development costs, and accelerate -blockchain business application -landing. +NULS is a blockchain infrastructure that provides customizable services and is also a global open-source community blockchain project. NULS adopts micro-services to achieve a highly modular underlying architecture, using smart contracts and cross-chain technologies, combined with the ability of ChainBox to quickly build chains, reduce development costs, and accelerate blockchain business application landing. ## Getting Started From 1aa6ef74fe91b7b61df97e422bca999dcafb65e4 Mon Sep 17 00:00:00 2001 From: reagost <155507352+reagost@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:30:17 +0800 Subject: [PATCH 16/75] Update README.md (#706) --- README.md | 69 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 541a89c87e..c0eef9cca9 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,23 @@ -# NULS 2.0 +# NULS v2 -## Welcome to NULS! ## +NULS v2 is the main running program of NULS 2.0 nodes. It contains 3 microservice modules: +- nuls-cores +- nuls-cmd-client +- nuls-api +nuls-cores consists of 11 sub-modules: +https://github.com/nuls-io/nuls-v2/tree/master/module/nuls-cores/src/main/java/io/nuls -NULS — Making It Easier To Innovate -## Introduction - -NULS is a blockchain infrastructure that provides customizable services and is also a global open-source community blockchain project. NULS adopts micro-services to achieve a highly modular underlying architecture, using smart contracts and cross-chain technologies, combined with the ability of ChainBox to quickly build chains, reduce development costs, and accelerate blockchain business application landing. ## Getting Started -test +Start a NULS node according to this boot. ### Download Release Download URL: [RELEASES](https://github.com/nuls-io/nuls-v2/releases) -## Running NULS 2.0 +## Running NULS v2 ### Bootstrap @@ -47,7 +48,7 @@ Note: The command will automatically end when all modules are started. ## Docker Quick Start -Stay tuned +Stay tuned. Join Discord to find out. ## Explorer @@ -67,20 +68,48 @@ Please check the following documents: Note: Some documents are in the process of being updated, so please understand if there are some inconsistencies. -## Contribution +## Contribute to NULS v2 +Click Star and Fork to start contributing improvements to NULS v2. +Hope more contributors can submit improvement suggestions and bug reports here. +Issues: https://github.com/nuls-io/nuls-v2/issues + + + +# Welcome to NULS! # + +NULS — Making It Easier To Innovate + +## Introduction + +NULS is a blockchain infrastructure that provides customizable services and is also a global open-source community blockchain project. NULS adopts micro-services to achieve a highly modular underlying architecture, using smart contracts and cross-chain technologies, combined with the ability of ChainBox to quickly build chains, reduce development costs, and accelerate blockchain business application landing. + +## Contribute to NULS +We are committed to making blockchain technology simpler and our slogan is "NULS Making It Easier to Innovate". + +Get to know NULS developers +https://nuls.io/developer + +You are welcome to contribute to NULS! We sincerely invite developers with rich experience in the blockchain field to join the NULS technology community. +https://nuls.io/community + +Documentation：https://docs.nuls.io +NULS Brand Assets: https://nuls.io/brand-assets + -Contributions to NULS are welcomed! We sincerely invite developers who are experienced in the blockchain field to join the NULS technology community. Details: https://nuls.community/d/9-invitation-of-community-developers. To be a great community, Nuls needs to welcome developers from all walks of life, with different backgrounds, and with a wide range of experience. ## License -Nuls is released under the [MIT](http://opensource.org/licenses/MIT) license. -Modules added in the future may be released under a different license specified in their module library path. +NULS is released under the [MIT](http://opensource.org/licenses/MIT) license. +Modules added in the future may be release under different license, will specified in the module library path. + +## Community -## Contact Us +- Website: https://nuls.io +- Twitter: https://twitter.com/nuls +- Discord:https://discord.gg/aRCwbj47WN +- Telegram: https://t.me/Nulsio) +- Medium: https://nuls.medium.com +- Forum: https://forum.nuls.io +- GitHub: https://github.com/nuls-io -- [Discord](https://discord.com/invite/aRCwbj47WN/) -- [Website](https://nuls.io/) -- [Telegram](https://t.me/Nulsio/) -- [Reddit](https://www.reddit.com/r/nulsservice/) -- [Twitter](https://twitter.com/Nuls/) -- [Facebook](https://www.facebook.com/nulscommunity/) +#### From 763fc4df0b49d9d248fde6045e72f4ded26f7e15 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jan 2024 17:04:49 +0800 Subject: [PATCH 17/75] Modify a document --- useguide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/useguide.md b/useguide.md index c00120da46..f5609e7921 100644 --- a/useguide.md +++ b/useguide.md @@ -8,7 +8,7 @@ [network] #组 port=18001 #参数key和值 ``` -nuls.ncf里面的内容看上去大概是这个样子 +nuls.ncf 里面的内容看上去大概是这个样子 ``` [global] @@ -22,7 +22,7 @@ keystoreFolder=/keystore/backup port=10081 ... ``` -[global]是一个特殊的组，所有的模块都会继承这个组里的配置项。全局通用配置可以配置在这个组下面。 +[global] 是一个特殊的组，所有的模块都会继承这个组里的配置项。全局通用配置可以配置在这个组下面。 [account]、[network]这两个是账户模块和网络模块的专有配置。名称对应模块Module.ncf里面的APP_NAME配置项。 当[global]和模块组下面有相同配置项时，模块组下面的配置优先级更高，覆盖global里的配置。 ### 与模块内配置文件的关系 From e39826be3af8649f46f4dfb54755bf958cc1a1b9 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jan 2024 21:00:05 +0800 Subject: [PATCH 18/75] en --- .gitignore | 1 + README.md | 2 +- build/default-config.ncf | 106 +- build/genesis-block.json | 2 +- .../io/nuls/base/api/provider/BaseReq.java | 2 +- .../base/api/provider/BaseRpcService.java | 14 +- .../nuls/base/api/provider/BaseService.java | 6 +- .../io/nuls/base/api/provider/Provider.java | 2 +- .../io/nuls/base/api/provider/Result.java | 2 +- .../base/api/provider/ServiceManager.java | 10 +- .../nuls/base/api/provider/ServiceProxy.java | 2 +- .../api/provider/account/AccountService.java | 36 +- .../account/AccountServiceForRpc.java | 2 +- .../provider/account/facade/AccountInfo.java | 8 +- .../account/facade/BackupAccountReq.java | 2 +- .../account/facade/CreateAccountReq.java | 2 +- .../facade/GenerateMultiSignAccountReq.java | 6 +- .../facade/GetAccountByAddressReq.java | 2 +- .../GetAccountPrivateKeyByAddressReq.java | 2 +- .../GetMultiSignAccountByAddressReq.java | 2 +- .../facade/ImportAccountByKeyStoreReq.java | 2 +- .../facade/ImportAccountByPrivateKeyReq.java | 2 +- .../facade/ImportKeyStoreFilesReq.java | 2 +- .../provider/account/facade/KeyStoreReq.java | 2 +- .../account/facade/MultiSignAccountInfo.java | 2 +- .../account/facade/RemoveAccountReq.java | 2 +- .../facade/RemoveMultiSignAccountReq.java | 2 +- .../account/facade/SetAccountAliasReq.java | 2 +- .../facade/SetMultiSignAccountAliasReq.java | 2 +- .../account/facade/UpdatePasswordReq.java | 2 +- .../provider/block/BlockServiceForRpc.java | 4 +- .../block/facade/BlockHeaderData.java | 6 +- .../block/facade/GetBlockHeaderByHashReq.java | 2 +- .../facade/GetBlockHeaderByHeightReq.java | 2 +- .../facade/GetBlockHeaderByLastHeightReq.java | 2 +- .../provider/consensus/ConsensusProvider.java | 14 +- .../consensus/ConsensusProviderForRpc.java | 2 +- .../provider/consensus/facade/AgentInfo.java | 2 +- .../consensus/facade/CreateAgentReq.java | 2 +- .../facade/CreateMultiSignAgentReq.java | 2 +- .../consensus/facade/DepositToAgentReq.java | 2 +- .../consensus/facade/GetAgentInfoReq.java | 2 +- .../consensus/facade/GetAgentListReq.java | 2 +- .../consensus/facade/GetDepositListReq.java | 2 +- .../facade/GetStopAgentCoinDataReq.java | 4 +- .../MultiSignAccountDepositToAgentReq.java | 2 +- .../facade/MultiSignAccountWithdrawReq.java | 2 +- .../consensus/facade/StopAgentReq.java | 4 +- .../facade/StopMultiSignAgentReq.java | 4 +- .../consensus/facade/WithdrawReq.java | 2 +- .../provider/contract/ContractProvider.java | 2 +- .../contract/ContractProviderForRpc.java | 2 +- .../contract/facade/AccountContractInfo.java | 2 +- .../contract/facade/CallContractReq.java | 2 +- .../provider/contract/facade/Contract.java | 2 +- .../contract/facade/CreateContractReq.java | 2 +- .../contract/facade/DeleteContractReq.java | 2 +- .../facade/GetAccountContractListReq.java | 2 +- .../facade/GetContractConstructorArgsReq.java | 2 +- .../contract/facade/GetContractInfoReq.java | 2 +- .../contract/facade/GetContractResultReq.java | 2 +- .../contract/facade/GetContractTxReq.java | 2 +- .../contract/facade/TokenTransferReq.java | 2 +- .../facade/TransferToContractReq.java | 2 +- .../contract/facade/ViewContractReq.java | 2 +- .../crosschain/ChainManageProvider.java | 10 +- .../crosschain/ChainManageProviderForRpc.java | 2 +- .../crosschain/CrossChainProvider.java | 12 +- .../crosschain/CrossChainProviderForRpc.java | 4 +- .../crosschain/facade/AddCrossAssetReq.java | 2 +- .../facade/AddCrossLocalAssetReq.java | 2 +- .../crosschain/facade/CreateCrossTxReq.java | 4 +- .../facade/CreateResetLocalVerifierTxReq.java | 2 +- .../facade/CrossAssetRegisterInfo.java | 2 +- .../facade/CrossChainRegisterInfo.java | 24 +- .../crosschain/facade/DisableAssetReq.java | 2 +- .../facade/GetCrossAssetInfoReq.java | 2 +- .../facade/GetCrossChainInfoReq.java | 2 +- .../crosschain/facade/GetCrossTxStateReq.java | 2 +- .../crosschain/facade/RegisterChainReq.java | 10 +- .../crosschain/facade/RehandleCtxReq.java | 2 +- .../api/provider/ledger/LedgerProvider.java | 6 +- .../provider/ledger/LedgerProviderForRpc.java | 2 +- .../ledger/facade/AccountBalanceInfo.java | 2 +- .../provider/ledger/facade/ContractAsset.java | 2 +- .../provider/ledger/facade/GetAssetReq.java | 2 +- .../provider/ledger/facade/GetBalanceReq.java | 2 +- .../ledger/facade/RegLocalAssetReq.java | 2 +- .../api/provider/network/NetworkProvider.java | 2 +- .../network/NetworkProviderForRpc.java | 2 +- .../provider/network/facade/NetworkInfo.java | 12 +- .../network/facade/RemoteNodeInfo.java | 2 +- .../provider/protocol/ProtocolProvider.java | 2 +- .../protocol/ProtocolProviderForRpc.java | 2 +- .../protocol/facade/GetVersionReq.java | 2 +- .../provider/protocol/facade/VersionInfo.java | 2 +- .../provider/transaction/TransferService.java | 18 +- .../transaction/TransferServiceForRpc.java | 6 +- .../facade/CreateMultiSignTransferReq.java | 2 +- .../facade/GetConfirmedTxByHashReq.java | 2 +- .../transaction/facade/GetTxByHashReq.java | 2 +- .../facade/MultiSignTransferRes.java | 2 +- .../facade/SignMultiSignTransferReq.java | 2 +- .../facade/TransactionCoinData.java | 10 +- .../transaction/facade/TransactionData.java | 4 +- .../facade/TransferByAliasReq.java | 12 +- .../transaction/facade/TransferReq.java | 2 +- .../nuls/base/protocol/MessageProcessor.java | 4 +- .../io/nuls/base/protocol/ModuleHelper.java | 8 +- .../io/nuls/base/protocol/MsgProperty.java | 20 +- .../java/io/nuls/base/protocol/Protocol.java | 2 +- .../nuls/base/protocol/ProtocolConstant.java | 4 +- .../io/nuls/base/protocol/ProtocolGroup.java | 4 +- .../base/protocol/ProtocolGroupManager.java | 6 +- .../io/nuls/base/protocol/ProtocolLoader.java | 14 +- .../io/nuls/base/protocol/RegisterHelper.java | 14 +- .../base/protocol/TransactionProcessor.java | 46 +- .../nuls/base/protocol/TxRegisterDetail.java | 24 +- .../base/protocol/cmd/CommonProtocolCmd.java | 4 +- .../base/protocol/cmd/MessageDispatcher.java | 6 +- .../protocol/cmd/TransactionDispatcher.java | 16 +- .../base/protocol/ProtocolLoaderTest.java | 2 +- .../src/test/resources/protocol-config.json | 2 +- .../src/main/java/io/nuls/base/RPCUtil.java | 2 +- .../io/nuls/base/basic/AddressPrefixInf.java | 2 +- .../java/io/nuls/base/basic/AddressTool.java | 30 +- .../io/nuls/base/basic/ProtocolVersion.java | 10 +- .../base/basic/TransactionFeeCalculator.java | 22 +- .../nuls/base/basic/TransactionManager.java | 4 +- .../java/io/nuls/base/cache/DataCacher.java | 4 +- .../main/java/io/nuls/base/data/Address.java | 4 +- .../nuls/base/data/BaseBusinessMessage.java | 4 +- .../main/java/io/nuls/base/data/Block.java | 4 +- .../io/nuls/base/data/BlockExtendsData.java | 22 +- .../java/io/nuls/base/data/BlockHeader.java | 4 +- .../src/main/java/io/nuls/base/data/Coin.java | 8 +- .../main/java/io/nuls/base/data/CoinData.java | 12 +- .../main/java/io/nuls/base/data/CoinFrom.java | 2 +- .../main/java/io/nuls/base/data/CoinTo.java | 2 +- .../io/nuls/base/data/MultiSigAccount.java | 2 +- .../java/io/nuls/base/data/NonceHashData.java | 10 +- .../java/io/nuls/base/data/NulsSignData.java | 2 +- .../java/io/nuls/base/data/RedPunishData.java | 2 +- .../java/io/nuls/base/data/SmallBlock.java | 14 +- .../java/io/nuls/base/data/Transaction.java | 6 +- .../io/nuls/base/data/YellowPunishData.java | 2 +- .../io/nuls/base/data/po/BlockHeaderPo.java | 4 +- .../main/java/io/nuls/base/script/Script.java | 52 +- .../io/nuls/base/script/ScriptBuilder.java | 72 +- .../java/io/nuls/base/script/ScriptUtil.java | 60 +- .../base/signture/MultiSignTxSignature.java | 8 +- .../io/nuls/base/signture/SignatureUtil.java | 124 +- .../base/signture/TransactionSignature.java | 8 +- .../nuls/base/data/BlockExtendsDataTest.java | 8 +- .../io/nuls/base/data/TransactionTest.java | 2 +- .../signture/MultiSignTxSignatureTest.java | 2 +- .../core/rockdb/constant/DBErrorCode.java | 2 +- .../core/rockdb/manager/RocksDBManager.java | 178 +- .../rockdb/manager/TransactionDBManager.java | 150 +- .../java/io/nuls/core/rockdb/model/Entry.java | 2 +- .../core/rockdb/service/BatchOperation.java | 6 +- .../rockdb/service/RocksDBBatchOperation.java | 4 +- .../core/rockdb/service/RocksDBService.java | 4 +- .../io/nuls/core/rockdb/util/DBUtils.java | 4 +- .../io/nuls/core/storage/RocksDBTest.java | 40 +- .../java/io/nuls/core/rpc/cmd/BaseCmd.java | 14 +- .../core/rpc/cmd/kernel/KernelCmd4Test.java | 4 +- .../io/nuls/core/rpc/cmd/kernel/ParamCmd.java | 2 +- .../java/io/nuls/core/rpc/info/Constants.java | 64 +- .../java/io/nuls/core/rpc/info/HostInfo.java | 22 +- .../java/io/nuls/core/rpc/info/NoUse.java | 6 +- .../io/nuls/core/rpc/invoke/BaseInvoke.java | 6 +- .../io/nuls/core/rpc/invoke/KernelInvoke.java | 8 +- .../io/nuls/core/rpc/model/CmdAnnotation.java | 16 +- .../io/nuls/core/rpc/model/CmdDetail.java | 2 +- .../io/nuls/core/rpc/model/CmdParameter.java | 10 +- .../io/nuls/core/rpc/model/CmdPriority.java | 8 +- .../io/nuls/core/rpc/model/ConfigItem.java | 2 +- .../io/nuls/core/rpc/model/NulsCoresCmd.java | 2 +- .../io/nuls/core/rpc/model/Parameter.java | 14 +- .../io/nuls/core/rpc/model/Parameters.java | 2 +- .../io/nuls/core/rpc/model/RegisterApi.java | 2 +- .../io/nuls/core/rpc/model/RequestOnly.java | 2 +- .../io/nuls/core/rpc/model/ResponseData.java | 4 +- .../nuls/core/rpc/model/TypeDescriptor.java | 2 +- .../io/nuls/core/rpc/model/message/Ack.java | 4 +- .../nuls/core/rpc/model/message/Message.java | 12 +- .../core/rpc/model/message/MessageType.java | 22 +- .../core/rpc/model/message/MessageUtil.java | 24 +- .../model/message/NegotiateConnection.java | 2 +- .../message/NegotiateConnectionResponse.java | 2 +- .../core/rpc/model/message/Notification.java | 2 +- .../model/message/RegisterCompoundMethod.java | 2 +- .../nuls/core/rpc/model/message/Request.java | 2 +- .../nuls/core/rpc/model/message/Response.java | 4 +- .../message/UnregisterCompoundMethod.java | 2 +- .../core/rpc/model/message/Unsubscribe.java | 2 +- .../nuls/core/rpc/modulebootstrap/Module.java | 2 +- .../rpc/modulebootstrap/ModuleStatusCmd.java | 2 +- .../rpc/modulebootstrap/NotifySender.java | 4 +- .../NulsRpcModuleBootstrap.java | 12 +- .../rpc/modulebootstrap/RegisterInvoke.java | 8 +- .../core/rpc/modulebootstrap/RpcModule.java | 86 +- .../rpc/modulebootstrap/RpcModuleState.java | 8 +- .../core/rpc/netty/bootstrap/NettyClient.java | 10 +- .../core/rpc/netty/bootstrap/NettyServer.java | 46 +- .../core/rpc/netty/channel/ConnectData.java | 50 +- .../core/rpc/netty/channel/EventListener.java | 2 +- .../netty/channel/manager/ConnectManager.java | 122 +- .../core/rpc/netty/handler/ClientHandler.java | 8 +- .../core/rpc/netty/handler/ServerHandler.java | 4 +- .../handler/message/TextMessageHandler.java | 16 +- .../netty/initializer/ClientInitializer.java | 8 +- .../netty/initializer/ServerInitializer.java | 12 +- .../processor/RequestMessageProcessor.java | 128 +- .../processor/ResponseMessageProcessor.java | 152 +- .../processor/container/RequestContainer.java | 2 +- .../container/ResponseContainer.java | 2 +- .../core/rpc/netty/test/KernelModule.java | 6 +- .../netty/thread/RequestByCountProcessor.java | 4 +- .../thread/RequestByPeriodProcessor.java | 10 +- .../netty/thread/RequestOnlyProcessor.java | 6 +- .../netty/thread/ResponseAutoProcessor.java | 10 +- .../netty/thread/StartServerProcessor.java | 6 +- .../core/rpc/util/AddressPrefixDatas.java | 4 +- .../java/io/nuls/core/rpc/util/DocTool.java | 36 +- .../io/nuls/core/rpc/util/NulsDateUtils.java | 6 +- .../java/io/nuls/core/rpc/util/RpcCall.java | 4 +- .../java/io/nuls/core/rpc/EncoderTest.java | 2 +- .../io/nuls/core/basic/InitializingBean.java | 4 +- .../io/nuls/core/constant/BaseConstant.java | 26 +- .../core/constant/CommonCodeConstanst.java | 2 +- .../java/io/nuls/core/constant/ErrorCode.java | 8 +- .../io/nuls/core/constant/ToolsConstant.java | 8 +- .../io/nuls/core/constant/TxStatusEnum.java | 8 +- .../java/io/nuls/core/constant/TxType.java | 124 +- .../nuls/core/core/annotation/Autowired.java | 6 +- .../nuls/core/core/annotation/Component.java | 8 +- .../core/core/annotation/Configuration.java | 8 +- .../core/core/annotation/Interceptor.java | 4 +- .../io/nuls/core/core/annotation/Order.java | 4 +- .../io/nuls/core/core/annotation/Persist.java | 2 +- .../io/nuls/core/core/annotation/Service.java | 8 +- .../io/nuls/core/core/annotation/Value.java | 4 +- .../nuls/core/core/config/ConfigSetting.java | 2 +- .../core/core/config/ConfigurationLoader.java | 22 +- .../core/config/IniModuleConfigParser.java | 4 +- .../core/config/JsonModuleConfigParser.java | 6 +- .../core/core/config/ModuleConfigParser.java | 6 +- .../core/config/NcfModuleConfigParser.java | 2 +- .../config/PropertiesModuleConfigParser.java | 2 +- .../persist/PersistConfigInterceptor.java | 2 +- .../core/config/persist/PersistManager.java | 40 +- .../inteceptor/DefaultMethodInterceptor.java | 16 +- .../ModularServiceMethodInterceptor.java | 40 +- .../base/BeanMethodInterceptor.java | 18 +- .../base/BeanMethodInterceptorChain.java | 30 +- .../base/BeanMethodInterceptorManager.java | 26 +- .../MultipleBeanMethodInterceptorChain.java | 46 +- .../java/io/nuls/core/core/ioc/ScanUtil.java | 26 +- .../nuls/core/core/ioc/SpringLiteContext.java | 112 +- .../java/io/nuls/core/crypto/AESEncrypt.java | 54 +- .../main/java/io/nuls/core/crypto/Base58.java | 12 +- .../main/java/io/nuls/core/crypto/ECKey.java | 30 +- .../io/nuls/core/crypto/EncryptedData.java | 4 +- .../java/io/nuls/core/crypto/HexUtil.java | 16 +- .../core/exception/BeanStatusException.java | 2 +- .../main/java/io/nuls/core/io/IoUtils.java | 210 +- .../src/main/java/io/nuls/core/log/Log.java | 52 +- .../io/nuls/core/log/logback/LogAppender.java | 48 +- .../io/nuls/core/log/logback/LogFilter.java | 4 +- .../nuls/core/log/logback/LoggerBuilder.java | 6 +- .../io/nuls/core/log/logback/NulsLogger.java | 60 +- .../java/io/nuls/core/model/ArraysTool.java | 6 +- .../io/nuls/core/model/BigIntegerUtils.java | 32 +- .../java/io/nuls/core/model/ByteUtils.java | 110 +- .../io/nuls/core/model/CollectionUtils.java | 62 +- .../java/io/nuls/core/model/DateUtils.java | 214 +- .../java/io/nuls/core/model/DoubleUtils.java | 206 +- .../io/nuls/core/model/FormatValidUtils.java | 20 +- .../java/io/nuls/core/model/LongUtils.java | 50 +- .../java/io/nuls/core/model/StringUtils.java | 94 +- .../java/io/nuls/core/parse/ConfigLoader.java | 20 +- .../java/io/nuls/core/parse/I18nUtils.java | 30 +- .../java/io/nuls/core/parse/JSONUtils.java | 74 +- .../java/io/nuls/core/parse/MapUtils.java | 12 +- .../io/nuls/core/parse/SerializeUtils.java | 184 +- .../io/nuls/core/parse/config/ConfigItem.java | 2 +- .../io/nuls/core/parse/config/IniEntity.java | 32 +- .../core/parse/config/PropertiesEntity.java | 8 +- .../java/io/nuls/core/thread/ThreadUtils.java | 56 +- .../core/thread/commom/NulsThreadFactory.java | 8 +- .../nuls/core/model/BigIntegerUtilsTest.java | 6 +- .../GenerateErrCodeConstantsProperties.java | 12 +- common/readme.md | 4 +- config/genesis-block.beta.json | 2 +- config/nuls.beta.ncf | 102 +- config/nuls.ncf | 104 +- docker.md | 20 +- genesis-block_dev.json | 2 +- kernel/readme.md | 4 +- module-beta.ncf | 104 +- module-dev-p.ncf | 104 +- module-dev.ncf | 104 +- module-prod.ncf | 104 +- module.ncf | 104 +- module/nuls-api/README.md | 136 +- module/nuls-api/documents/eg_jsonrpc.json | 16 +- module/nuls-api/documents/eg_restful.json | 14 +- module/nuls-api/documents/nuls-api_JSONRPC.md | 3464 ++++++++--------- .../documents/nuls-api_Postman_JSONRPC.json | 2 +- .../documents/nuls-api_Postman_RESTFUL.json | 2 +- module/nuls-api/documents/nuls-api_RESTFUL.md | 3288 ++++++++-------- module/nuls-api/module.ncf | 4 +- .../java/io/nuls/provider/ApiBootstrap.java | 2 +- .../main/java/io/nuls/provider/MyModule.java | 8 +- .../provider/api/cache/LedgerAssetCache.java | 4 +- .../api/constant/CommandConstant.java | 50 +- .../jsonrpc/controller/AccountController.java | 324 +- .../jsonrpc/controller/BlockController.java | 66 +- .../jsonrpc/controller/ChainController.java | 30 +- .../controller/ConsensusController.java | 196 +- .../controller/ContractController.java | 462 +-- .../controller/CrossChainController.java | 6 +- .../jsonrpc/controller/NetworkController.java | 14 +- .../controller/TransactionController.java | 176 +- .../api/resources/AccountLedgerResource.java | 126 +- .../api/resources/AccountResource.java | 194 +- .../provider/api/resources/BlockResource.java | 44 +- .../api/resources/ConsensusResource.java | 148 +- .../api/resources/ContractResource.java | 228 +- .../api/resources/SystemResource.java | 20 +- .../api/resources/TransactionResource.java | 6 +- .../provider/model/dto/AccountBalanceDto.java | 14 +- .../dto/AccountBalanceWithDecimalsDto.java | 16 +- .../model/dto/AccountKeyStoreDto.java | 10 +- .../io/nuls/provider/model/dto/CoinDto.java | 8 +- .../nuls/provider/model/dto/CoinFromDto.java | 4 +- .../io/nuls/provider/model/dto/CoinToDto.java | 2 +- .../model/dto/ContractConstructorInfoDto.java | 4 +- .../provider/model/dto/ContractInfoDto.java | 32 +- .../model/dto/ContractInternalCreateDto.java | 8 +- .../dto/ContractInvokeRegisterCmdDto.java | 8 +- .../model/dto/ContractMergedTransferDto.java | 10 +- .../ContractMultyAssetMergedTransferDto.java | 14 +- .../provider/model/dto/ContractOutputDto.java | 4 +- .../provider/model/dto/ContractResultDto.java | 46 +- .../dto/ContractToken721TransferDto.java | 10 +- .../model/dto/ContractTokenInfoDto.java | 18 +- .../model/dto/ContractTokenTransferDto.java | 14 +- .../model/dto/ContractTransactionDto.java | 32 +- .../provider/model/dto/DepositInfoDto.java | 14 +- .../io/nuls/provider/model/dto/InputDto.java | 12 +- .../model/dto/MultyAssetOutputDto.java | 10 +- .../io/nuls/provider/model/dto/OutputDto.java | 10 +- .../provider/model/dto/ProgramMethod.java | 20 +- .../provider/model/dto/ProgramMethodArg.java | 8 +- .../provider/model/dto/RandomSeedDTO.java | 6 +- .../provider/model/dto/TransactionDto.java | 28 +- .../provider/model/dto/block/BlockDto.java | 6 +- .../model/dto/block/BlockHeaderDto.java | 42 +- .../model/form/AccountCreateForm.java | 10 +- .../model/form/AccountKeyStoreBackup.java | 6 +- .../model/form/AccountKeyStoreImportForm.java | 6 +- .../form/AccountKeyStoreJsonImportForm.java | 6 +- .../model/form/AccountPasswordForm.java | 4 +- .../model/form/AccountPriKeyPasswordForm.java | 8 +- .../model/form/AccountPublicKeyForm.java | 6 +- .../model/form/AccountUpdatePasswordForm.java | 6 +- .../nuls/provider/model/form/AliasTxForm.java | 8 +- .../nuls/provider/model/form/BalanceForm.java | 6 +- .../io/nuls/provider/model/form/Base.java | 2 +- .../model/form/CrossTransferForm.java | 16 +- .../model/form/EncryptedPriKeySignForm.java | 14 +- .../model/form/EncryptedPriKeysSignForm.java | 8 +- .../provider/model/form/GetPriKeyForm.java | 8 +- .../form/MultiSignAccountCreateForm.java | 6 +- .../provider/model/form/MultiSignForm.java | 6 +- .../nuls/provider/model/form/PriKeyForm.java | 4 +- .../provider/model/form/PriKeySignForm.java | 8 +- .../model/form/ResetPasswordForm.java | 10 +- .../provider/model/form/SetAliasForm.java | 8 +- .../provider/model/form/TransferForm.java | 16 +- .../io/nuls/provider/model/form/TxForm.java | 4 +- .../model/form/ValidateAddressForm.java | 6 +- .../model/form/consensus/CreateAgentForm.java | 14 +- .../model/form/consensus/DepositForm.java | 10 +- .../consensus/GetStopAgentCoinDataForm.java | 4 +- .../consensus/RandomRawSeedCountForm.java | 6 +- .../consensus/RandomRawSeedHeightForm.java | 6 +- .../form/consensus/RandomSeedCountForm.java | 8 +- .../form/consensus/RandomSeedHeightForm.java | 8 +- .../model/form/consensus/StopAgentForm.java | 6 +- .../model/form/consensus/WithdrawForm.java | 8 +- .../model/form/contract/ContractBase.java | 12 +- .../model/form/contract/ContractCall.java | 12 +- .../form/contract/ContractCallOffline.java | 24 +- .../model/form/contract/ContractCode.java | 4 +- .../model/form/contract/ContractCodeHash.java | 4 +- .../form/contract/ContractComputeAddress.java | 2 +- .../model/form/contract/ContractCreate.java | 6 +- .../form/contract/ContractCreateOffline.java | 18 +- .../model/form/contract/ContractDelete.java | 8 +- .../form/contract/ContractDeleteOffline.java | 10 +- .../form/contract/ContractMethodForm.java | 6 +- .../form/contract/ContractResultListForm.java | 2 +- .../form/contract/ContractTokenTransfer.java | 14 +- .../ContractTokenTransferOffline.java | 18 +- .../model/form/contract/ContractTransfer.java | 12 +- .../contract/ContractTransferOffline.java | 16 +- .../form/contract/ContractValidateCall.java | 20 +- .../form/contract/ContractValidateCreate.java | 12 +- .../form/contract/ContractValidateDelete.java | 6 +- .../model/form/contract/ContractViewCall.java | 10 +- .../form/contract/ImputedGasContractCall.java | 16 +- .../contract/ImputedGasContractCreate.java | 8 +- .../provider/model/jsonrpc/RpcErrorCode.java | 16 +- .../nuls/provider/rpctools/AccountTools.java | 12 +- .../io/nuls/provider/rpctools/BlockTools.java | 12 +- .../io/nuls/provider/rpctools/CallRpc.java | 2 +- .../provider/rpctools/CrossChainTools.java | 2 +- .../nuls/provider/rpctools/LegderTools.java | 4 +- .../provider/rpctools/TransactionTools.java | 12 +- .../io/nuls/provider/rpctools/vo/Account.java | 8 +- .../provider/rpctools/vo/AccountBalance.java | 22 +- .../vo/AccountBalanceWithDecimals.java | 22 +- .../rpctools/vo/TxRegisterDetail.java | 10 +- .../io/nuls/provider/utils/ApiDocTool.java | 68 +- .../nuls/provider/utils/BlackListUtils.java | 10 +- .../main/java/io/nuls/provider/utils/Log.java | 52 +- .../java/io/nuls/provider/utils/Utils.java | 6 +- .../nuls-api/src/main/resources/module.json | 2 +- module/nuls-cmd-client/document/cli-gude.md | 1170 +++--- ...\235\227CMD\346\216\245\345\217\243-V1.md" | 1172 +++--- .../nuls/cmd/client/CmdClientBootstrap.java | 4 +- .../io/nuls/cmd/client/CmdClientModule.java | 4 +- .../io/nuls/cmd/client/CommandHandler.java | 6 +- .../io/nuls/cmd/client/CommandHelper.java | 16 +- .../java/io/nuls/cmd/client/ParamVailder.java | 2 +- .../nuls/cmd/client/ParameterException.java | 2 +- .../main/java/io/nuls/cmd/client/Tools.java | 2 +- .../io/nuls/cmd/client/config/Config.java | 2 +- .../cmd/client/processor/CommandGroup.java | 2 +- .../client/processor/CommandProcessor.java | 2 +- .../client/processor/ErrorCodeConstants.java | 4 +- .../account/BackupAccountProcessor.java | 4 +- .../account/CreateMultiAccountProcessor.java | 6 +- .../account/GetMultiSignAccountProcessor.java | 2 +- .../account/ImportByKeyStoreProcessor.java | 4 +- .../account/ImportKeyStoreFilesProcessor.java | 2 +- .../account/ImportMultiAccountProcessor.java | 4 +- .../RemoveMultiSignAccountProcessor.java | 2 +- .../account/SetMultiSignAliasProcessor.java | 2 +- .../account/UpdatePasswordProcessor.java | 2 +- .../consensus/ConsensusBaseProcessor.java | 2 +- .../consensus/CreateAgentProcessor.java | 2 +- .../CreateMultiSignAgentProcessor.java | 4 +- .../DepositForMultiSignProcessor.java | 2 +- .../consensus/GetAgentInfoProcessor.java | 2 +- .../consensus/GetAgentsProcessor.java | 2 +- .../StopMultiSignAgentProcessor.java | 2 +- .../WithdrawForMultiSignProcessor.java | 2 +- .../contract/CallContractProcessor.java | 2 +- .../contract/ContractBaseProcessor.java | 4 +- .../contract/CreateContractProcessor.java | 2 +- .../contract/GetContractTxProcessor.java | 2 +- .../crosschain/CreateCrossTxProcessor.java | 2 +- .../crosschain/CrossAssetAddProcessor.java | 2 +- .../CrossAssetDisableProcessor.java | 2 +- .../crosschain/CrossChainBaseProcessor.java | 2 +- .../CrossLocalAssetAddProcessor.java | 2 +- .../GetCrossAssetInfoProcessor.java | 2 +- .../GetCrossChainRegisterInfoProcessor.java | 2 +- .../GetCrossChainsSimpleInfoProcessor.java | 2 +- .../crosschain/GetCrossTxStateProcessor.java | 2 +- .../RegisterCrossChainProcessor.java | 6 +- .../crosschain/RehandleCrossTxProcessor.java | 2 +- .../ResetLocalVerifierTxProcessor.java | 2 +- .../crosschain/UpdateCrossChainProcessor.java | 6 +- .../ledger/RegisterLocalAssetProcessor.java | 2 +- .../processor/system/EvalProcessor.java | 2 +- ...eateMultiSignTransferAndSignProcessor.java | 2 +- .../CreateMultiSignTransferProcessor.java | 2 +- .../processor/transaction/GetTxProcessor.java | 2 +- .../SignMultiSingTransferProcessor.java | 4 +- .../transaction/TransactionBaseProcessor.java | 2 +- .../io/nuls/cmd/client/utils/AssetsUtil.java | 2 +- .../java/io/nuls/cmd/client/utils/Na.java | 4 +- .../src/main/resources/module.json | 2 +- .../test/account/TestCreateProcessor.java | 4 +- .../nuls-cores/documents/account/account.md | 772 ++-- .../documents/account/account_design.md | 276 +- module/nuls-cores/documents/account/readme.md | 22 +- module/nuls-cores/documents/block/block.md | 392 +- module/nuls-cores/documents/block/readme.md | 144 +- .../documents/chain/chain-manager.md | 446 +-- .../documents/consensus/consensus.md | 1210 +++--- ...45\235\227\350\256\276\350\256\241v1.3.md" | 338 +- .../nuls-cores/documents/consensus/readme.md | 34 +- .../nuls-cores/documents/contract/readme.md | 10 +- .../documents/contract/smart-contract.md | 1106 +++--- .../documents/crosschain/cross-chain.md | 458 +-- ...45\235\227\350\256\276\350\256\241v1.3.md" | 452 +-- .../nuls-cores/documents/crosschain/readme.md | 38 +- module/nuls-cores/documents/ledger/README.md | 30 +- module/nuls-cores/documents/ledger/ledger.md | 350 +- .../nuls-cores/documents/network/network.md | 468 +-- module/nuls-cores/documents/network/readme.md | 40 +- .../nuls-cores/documents/protocol/readme.md | 144 +- .../documents/transaction/readme.md | 20 +- .../documents/transaction/transaction.md | 404 +- .../transaction/transaction_design.md | 266 +- .../main/java/io/nuls/NulsCoresBootstrap.java | 12 +- .../io/nuls/account/AccountBootstrap.java | 16 +- .../io/nuls/account/config/NulsConfig.java | 14 +- .../account/constant/AccountConstant.java | 38 +- .../constant/AccountStorageConstant.java | 8 +- .../io/nuls/account/constant/RpcConstant.java | 30 +- .../account/helper/AccountBlockHelper.java | 8 +- .../helper/AccountContractCallHelper.java | 6 +- .../io/nuls/account/model/bo/Account.java | 30 +- .../nuls/account/model/bo/AccountStatus.java | 4 +- .../java/io/nuls/account/model/bo/Chain.java | 8 +- .../nuls/account/model/bo/VerifyTxResult.java | 14 +- .../account/model/bo/tx/AccountBlockInfo.java | 2 +- .../account/model/bo/tx/AliasTransaction.java | 2 +- .../bo/tx/txdata/AccountContractCallData.java | 2 +- .../io/nuls/account/model/dto/AccountDTO.java | 14 +- .../account/model/dto/AccountKeyStoreDTO.java | 10 +- .../account/model/dto/AccountOfflineDTO.java | 34 +- .../nuls/account/model/dto/BaseCoinDTO.java | 12 +- .../io/nuls/account/model/dto/CoinDTO.java | 8 +- .../account/model/dto/MultiSignCoinToDTO.java | 4 +- .../dto/MultiSignTransactionResultDTO.java | 4 +- .../model/dto/MultiSignTransferDTO.java | 12 +- .../account/model/dto/SimpleAccountDTO.java | 16 +- .../nuls/account/model/dto/TransferDTO.java | 10 +- .../io/nuls/account/rpc/call/EventCall.java | 2 +- .../io/nuls/account/rpc/call/LedgerCall.java | 6 +- .../account/rpc/call/TransactionCall.java | 4 +- .../nuls/account/rpc/cmd/AccountBlockCmd.java | 34 +- .../io/nuls/account/rpc/cmd/AccountCmd.java | 434 +-- .../account/rpc/cmd/AcmTransactionCmd.java | 56 +- .../account/rpc/cmd/AddressPrefixCmd.java | 28 +- .../io/nuls/account/rpc/cmd/AliasCmd.java | 34 +- .../account/rpc/cmd/MultiSignAccountCmd.java | 66 +- .../account/service/AccountCacheService.java | 4 +- .../service/AccountKeyStoreService.java | 6 +- .../nuls/account/service/AccountService.java | 58 +- .../io/nuls/account/service/AliasService.java | 20 +- .../io/nuls/account/service/ChainService.java | 8 +- .../service/MultiSignAccountService.java | 14 +- .../account/service/TransactionService.java | 24 +- .../impl/AccountKeyStoreServiceImpl.java | 16 +- .../service/impl/AccountServiceImpl.java | 24 +- .../service/impl/AliasServiceImpl.java | 28 +- .../service/impl/ChainServiceImpl.java | 2 +- .../impl/MultiSigAccountServiceImpl.java | 18 +- .../service/impl/TransactionServiceImpl.java | 176 +- ...rTransferOnContractCallStorageService.java | 2 +- .../storage/AccountStorageService.java | 16 +- .../MultiSigAccountStorageService.java | 10 +- .../impl/AccountBlockStorageServiceImpl.java | 26 +- ...nsferOnContractCallStorageServiceImpl.java | 6 +- .../impl/AccountStorageServiceImpl.java | 10 +- .../storage/impl/AliasStorageServiceImpl.java | 4 +- .../MultiSigAccountStorageServiceImpl.java | 4 +- .../io/nuls/account/tx/v1/AliasProcessor.java | 12 +- .../tx/v11/AccountLockProcessorV11.java | 10 +- .../tx/v11/AccountUnlockProcessorV11.java | 10 +- .../tx/v12/AccountLockProcessorV12.java | 10 +- ...ForTransferOnContractCallProcessorV13.java | 14 +- .../io/nuls/account/util/AccountTool.java | 6 +- .../io/nuls/account/util/Preconditions.java | 8 +- .../java/io/nuls/account/util/TxUtil.java | 18 +- .../account/util/manager/ChainManager.java | 20 +- .../account/util/validator/TxValidator.java | 40 +- .../java/io/nuls/block/BlockBootstrap.java | 30 +- .../nuls/block/constant/BlockErrorCode.java | 6 +- .../nuls/block/constant/BlockForwardEnum.java | 12 +- .../io/nuls/block/constant/ChainTypeEnum.java | 32 +- .../nuls/block/constant/CommandConstant.java | 64 +- .../java/io/nuls/block/constant/Constant.java | 20 +- .../block/constant/LocalBlockStateEnum.java | 12 +- .../java/io/nuls/block/constant/NodeEnum.java | 10 +- .../io/nuls/block/constant/StatusEnum.java | 20 +- .../nuls/block/manager/BlockChainManager.java | 124 +- .../io/nuls/block/manager/ChainManager.java | 14 +- .../io/nuls/block/manager/ContextManager.java | 6 +- .../io/nuls/block/message/BlockMessage.java | 10 +- .../nuls/block/message/CompleteMessage.java | 4 +- .../nuls/block/message/HashListMessage.java | 4 +- .../io/nuls/block/message/HashMessage.java | 4 +- .../io/nuls/block/message/HeightMessage.java | 4 +- .../block/message/HeightRangeMessage.java | 4 +- .../nuls/block/message/SmallBlockMessage.java | 6 +- .../io/nuls/block/message/TxGroupMessage.java | 6 +- .../block/message/handler/BlockHandler.java | 8 +- .../message/handler/CompleteHandler.java | 4 +- .../handler/ForwardSmallBlockHandler.java | 10 +- .../handler/GetBlockByHeightHandler.java | 6 +- .../message/handler/GetBlockHandler.java | 6 +- .../message/handler/GetBlocksHandler.java | 4 +- .../message/handler/GetSmallBlockHandler.java | 4 +- .../message/handler/GetTxGroupHandler.java | 4 +- .../message/handler/SmallBlockHandler.java | 28 +- .../block/message/handler/TxGroupHandler.java | 10 +- .../block/model/BlockDownloaderParams.java | 16 +- .../io/nuls/block/model/CachedSmallBlock.java | 10 +- .../main/java/io/nuls/block/model/Chain.java | 58 +- .../io/nuls/block/model/ChainContext.java | 46 +- .../io/nuls/block/model/GenesisBlock.java | 24 +- .../main/java/io/nuls/block/model/Node.java | 28 +- .../java/io/nuls/block/model/TxGroupTask.java | 14 +- .../java/io/nuls/block/rpc/BlockResource.java | 164 +- .../io/nuls/block/rpc/call/ConsensusCall.java | 32 +- .../nuls/block/rpc/call/CrossChainCall.java | 6 +- .../io/nuls/block/rpc/call/NetworkCall.java | 42 +- .../io/nuls/block/rpc/call/ProtocolCall.java | 12 +- .../nuls/block/rpc/call/TransactionCall.java | 46 +- .../io/nuls/block/service/BlockService.java | 140 +- .../block/service/impl/BlockServiceImpl.java | 48 +- .../block/storage/BlockStorageService.java | 36 +- .../block/storage/ChainStorageService.java | 32 +- .../storage/impl/BlockStorageServiceImpl.java | 4 +- .../storage/impl/ChainStorageServiceImpl.java | 4 +- .../io/nuls/block/test/BlockGenerator.java | 8 +- .../io/nuls/block/thread/BlockConsumer.java | 12 +- .../io/nuls/block/thread/BlockDownloader.java | 12 +- .../nuls/block/thread/BlockSynchronizer.java | 92 +- .../block/thread/monitor/BaseMonitor.java | 10 +- .../thread/monitor/ForkChainsMonitor.java | 12 +- .../thread/monitor/NetworkResetMonitor.java | 12 +- .../block/thread/monitor/NodesMonitor.java | 8 +- .../monitor/OrphanChainsMaintainer.java | 36 +- .../thread/monitor/OrphanChainsMonitor.java | 84 +- .../thread/monitor/StorageSizeMonitor.java | 38 +- .../thread/monitor/TxGroupRequestor.java | 4 +- .../java/io/nuls/block/utils/BlockUtil.java | 86 +- .../io/nuls/block/utils/ChainGenerator.java | 42 +- .../io/nuls/block/utils/ConfigLoader.java | 8 +- .../java/io/nuls/block/utils/LoggerUtil.java | 2 +- .../nuls/block/utils/SingleBlockCacher.java | 22 +- .../io/nuls/block/utils/SmallBlockCacher.java | 40 +- .../io/nuls/chain/ChainManagerBootstrap.java | 20 +- .../java/io/nuls/chain/info/CmConstants.java | 2 +- .../java/io/nuls/chain/info/CmErrorCode.java | 2 +- .../io/nuls/chain/info/CmRuntimeInfo.java | 4 +- .../java/io/nuls/chain/info/RpcConstants.java | 20 +- .../io/nuls/chain/model/dto/AssetDto.java | 14 +- .../io/nuls/chain/model/dto/ChainDto.java | 12 +- .../io/nuls/chain/model/dto/RegAssetDto.java | 26 +- .../io/nuls/chain/model/dto/RegChainDto.java | 76 +- .../java/io/nuls/chain/model/po/Asset.java | 4 +- .../io/nuls/chain/model/po/BlockChain.java | 42 +- .../io/nuls/chain/model/po/ChainAsset.java | 12 +- .../nuls/chain/model/tx/BlockChainTxType.java | 8 +- .../nuls/chain/model/tx/txdata/TxChain.java | 8 +- .../nuls/chain/model/tx/txdatav5/TxChain.java | 8 +- .../io/nuls/chain/rpc/call/RpcService.java | 10 +- .../chain/rpc/call/impl/RpcServiceImpl.java | 34 +- .../java/io/nuls/chain/rpc/cmd/AssetCmd.java | 106 +- .../io/nuls/chain/rpc/cmd/BaseChainCmd.java | 14 +- .../io/nuls/chain/rpc/cmd/CmmChainCmd.java | 132 +- .../io/nuls/chain/rpc/cmd/TxCirculateCmd.java | 82 +- .../io/nuls/chain/service/AssetService.java | 4 +- .../nuls/chain/service/CacheDataService.java | 14 +- .../io/nuls/chain/service/ChainService.java | 18 +- .../io/nuls/chain/service/MessageService.java | 2 +- .../chain/service/TxCirculateService.java | 6 +- .../chain/service/impl/AssetServiceImpl.java | 10 +- .../service/impl/CacheDataServiceImpl.java | 40 +- .../chain/service/impl/ChainServiceImpl.java | 32 +- .../chain/service/impl/CmTaskManager.java | 2 +- .../service/impl/CmTransferServiceImpl.java | 12 +- .../service/impl/MessageServiceImpl.java | 16 +- .../service/impl/TxCirculateServiceImpl.java | 24 +- .../service/impl/ValidateServiceImpl.java | 22 +- .../tx/v1/AddAssetTransferProcessor.java | 4 +- .../tx/v1/DestroyChainTransferProcessor.java | 10 +- .../tx/v1/DisableAssetTransferProcessor.java | 4 +- .../tx/v1/RegChainTransferProcessor.java | 6 +- .../tx/v12/AddAssetTransferProcessor.java | 4 +- .../tx/v15/AddAssetTransferProcessor.java | 4 +- .../tx/v15/RegChainTransferProcessor.java | 6 +- .../tx/v5/AddAssetTransferProcessor.java | 4 +- .../tx/v5/DestroyChainTransferProcessor.java | 10 +- .../tx/v5/DisableAssetTransferProcessor.java | 4 +- .../tx/v5/RegChainTransferProcessor.java | 6 +- .../tx/v7/AddAssetTransferProcessor.java | 4 +- .../tx/v7/DestroyChainTransferProcessor.java | 10 +- .../tx/v7/DisableAssetTransferProcessor.java | 4 +- .../tx/v7/RegChainTransferProcessor.java | 6 +- .../chain/storage/BlockHeightStorage.java | 2 +- .../nuls/chain/storage/CacheDatasStorage.java | 2 +- .../io/nuls/chain/storage/ChainStorage.java | 10 +- .../java/io/nuls/chain/storage/InitDB.java | 2 +- .../chain/storage/impl/AssetStorageImpl.java | 2 +- .../nuls/chain/storage/impl/BaseStorage.java | 2 +- .../storage/impl/BlockHeightStorageImpl.java | 2 +- .../storage/impl/CacheDatasStorageImpl.java | 2 +- .../storage/impl/ChainAssetStorageImpl.java | 2 +- .../impl/ChainCirculateStorageImpl.java | 2 +- .../chain/storage/impl/ChainStorageImpl.java | 12 +- .../nuls/chain/task/ChainAssetUpdateTask.java | 8 +- .../main/java/io/nuls/chain/util/TxUtil.java | 2 +- .../main/java/io/nuls/common/ConfigBean.java | 124 +- .../java/io/nuls/common/ConfigManager.java | 18 +- .../java/io/nuls/common/NulsCoresConfig.java | 48 +- .../io/nuls/consensus/ConsensusBootStrap.java | 10 +- .../consensus/constant/ConsensusConstant.java | 28 +- .../constant/ConsensusErrorCode.java | 2 +- .../base/service/EconomicService.java | 10 +- .../nuls/constant/NulsEconomicConstant.java | 2 +- .../economic/nuls/constant/ParamConstant.java | 4 +- .../economic/nuls/model/bo/AgentInfo.java | 2 +- .../nuls/model/bo/ConsensusConfigInfo.java | 2 +- .../economic/nuls/model/bo/DepositInfo.java | 2 +- .../economic/nuls/model/bo/InflationInfo.java | 2 +- .../economic/nuls/model/bo/RoundInfo.java | 2 +- .../nuls/service/EconomicServiceImpl.java | 2 +- .../nuls/util/manager/EconomicManager.java | 82 +- .../io/nuls/consensus/model/bo/BlockData.java | 4 +- .../io/nuls/consensus/model/bo/Chain.java | 48 +- .../consensus/model/bo/ChargeResultData.java | 2 +- .../model/bo/consensus/Evidence.java | 2 +- .../model/bo/round/MeetingMember.java | 38 +- .../model/bo/round/MeetingRound.java | 44 +- .../model/bo/round/RoundValidResult.java | 2 +- .../consensus/model/bo/tx/txdata/Agent.java | 66 +- .../model/bo/tx/txdata/CancelDeposit.java | 2 +- .../model/bo/tx/txdata/DelayStopAgent.java | 2 +- .../consensus/model/bo/tx/txdata/Deposit.java | 20 +- .../model/bo/tx/txdata/RedPunishData.java | 2 +- .../model/bo/tx/txdata/StopAgent.java | 2 +- .../model/bo/tx/txdata/YellowPunishData.java | 2 +- .../consensus/model/dto/RandomSeedDTO.java | 6 +- .../model/dto/input/ContractAgentDTO.java | 2 +- .../model/dto/input/ContractDepositDTO.java | 2 +- .../model/dto/input/ContractStopAgentDTO.java | 2 +- .../model/dto/input/ContractWithdrawDTO.java | 2 +- .../model/dto/input/CreateAgentDTO.java | 2 +- .../model/dto/input/CreateDepositDTO.java | 2 +- .../model/dto/input/CreateMultiAgentDTO.java | 2 +- .../dto/input/CreateMultiDepositDTO.java | 2 +- .../model/dto/input/MultiWithdrawDTO.java | 2 +- .../model/dto/input/SearchAgentDTO.java | 2 +- .../model/dto/input/SearchAllAgentDTO.java | 2 +- .../dto/input/SearchContractAgentDTO.java | 2 +- .../dto/input/SearchContractDepositDTO.java | 2 +- .../model/dto/input/SearchDepositDTO.java | 2 +- .../model/dto/input/SearchPunishDTO.java | 2 +- .../model/dto/input/StopAgentDTO.java | 2 +- .../model/dto/input/StopMultiAgentDTO.java | 2 +- .../model/dto/input/ValidBlockDTO.java | 2 +- .../model/dto/input/WithdrawDTO.java | 2 +- .../dto/output/AccountConsensusInfoDTO.java | 18 +- .../consensus/model/dto/output/AgentDTO.java | 40 +- .../model/dto/output/DepositDTO.java | 26 +- .../model/dto/output/PunishLogDTO.java | 2 +- .../dto/output/WholeNetConsensusInfoDTO.java | 14 +- .../model/dto/transaction/CoinDto.java | 8 +- .../model/dto/transaction/CoinFromDto.java | 4 +- .../model/dto/transaction/CoinToDto.java | 2 +- .../model/dto/transaction/TransactionDto.java | 26 +- .../io/nuls/consensus/model/po/AgentPo.java | 4 +- .../io/nuls/consensus/model/po/DepositPo.java | 2 +- .../nuls/consensus/model/po/PunishLogPo.java | 14 +- .../model/po/RandomSeedStatusPo.java | 2 +- .../consensus/rpc/call/CallMethodUtils.java | 70 +- .../io/nuls/consensus/rpc/cmd/AgentCmd.java | 152 +- .../io/nuls/consensus/rpc/cmd/BlockCmd.java | 52 +- .../io/nuls/consensus/rpc/cmd/ChainCmd.java | 110 +- .../rpc/cmd/ConsensusTransactionHandler.java | 42 +- .../consensus/rpc/cmd/CsmContractCmd.java | 126 +- .../io/nuls/consensus/rpc/cmd/DepositCmd.java | 52 +- .../nuls/consensus/rpc/cmd/MultiSignCmd.java | 96 +- .../io/nuls/consensus/rpc/cmd/RandomCmd.java | 44 +- .../nuls/consensus/service/AgentService.java | 26 +- .../nuls/consensus/service/BlockService.java | 8 +- .../nuls/consensus/service/ChainService.java | 30 +- .../consensus/service/ContractService.java | 16 +- .../consensus/service/DepositService.java | 10 +- .../consensus/service/MultiSignService.java | 10 +- .../service/impl/AgentServiceImpl.java | 50 +- .../service/impl/BlockServiceImpl.java | 12 +- .../service/impl/ChainServiceImpl.java | 36 +- .../service/impl/ContractServiceImpl.java | 4 +- .../service/impl/DepositServiceImpl.java | 20 +- .../service/impl/MultiSignServiceImpl.java | 2 +- .../storage/AgentStorageService.java | 32 +- .../storage/DepositStorageService.java | 28 +- .../storage/PunishStorageService.java | 20 +- .../storage/impl/AgentStorageServiceImpl.java | 2 +- .../impl/DepositStorageServiceImpl.java | 2 +- .../impl/PunishStorageServiceImpl.java | 2 +- .../consensus/tx/v1/CoinBaseProcessor.java | 6 +- .../tx/v1/ContractCreateAgentProcessor.java | 10 +- .../tx/v1/ContractDepositProcessor.java | 8 +- .../tx/v1/ContractStopAgentProcessor.java | 6 +- .../tx/v1/ContractWithdrawProcessor.java | 8 +- .../consensus/tx/v1/CreateAgentProcessor.java | 10 +- .../consensus/tx/v1/DepositProcessor.java | 6 +- .../consensus/tx/v1/RedPunishProcessor.java | 8 +- .../consensus/tx/v1/StopAgentProcessor.java | 6 +- .../consensus/tx/v1/WithdrawProcessor.java | 8 +- .../tx/v1/YellowPunishProcessor.java | 6 +- .../tx/v2/ContractDepositProcessor.java | 8 +- .../tx/v2/ContractStopAgentProcessor.java | 10 +- .../consensus/tx/v2/DepositProcessor.java | 8 +- .../consensus/tx/v2/StopAgentProcessor.java | 8 +- .../tx/v3/ContractDepositProcessor.java | 18 +- .../tx/v3/ContractStopAgentProcessor.java | 10 +- .../consensus/tx/v3/CreateAgentProcessor.java | 24 +- .../consensus/tx/v3/DepositProcessor.java | 26 +- .../consensus/tx/v3/StopAgentProcessor.java | 14 +- .../consensus/tx/v3/WithdrawProcessor.java | 22 +- .../consensus/tx/v4/CreateAgentProcessor.java | 26 +- .../tx/v4/DelayStopAgentProcessor.java | 16 +- .../consensus/tx/v4/DepositProcessor.java | 28 +- .../consensus/tx/v4/RedPunishProcessor.java | 16 +- .../consensus/tx/v4/StopAgentProcessor.java | 14 +- .../consensus/tx/v4/WithdrawProcessor.java | 22 +- .../io/nuls/consensus/utils/LoggerUtil.java | 6 +- .../java/io/nuls/consensus/utils/TxUtil.java | 2 +- .../utils/compare/AgentComparator.java | 2 +- .../utils/compare/CoinFromComparator.java | 2 +- .../utils/compare/CoinToComparator.java | 2 +- .../utils/compare/DepositComparator.java | 2 +- .../utils/compare/EvidenceComparator.java | 2 +- .../utils/compare/PunishLogComparator.java | 2 +- .../utils/enumeration/ConsensusStatus.java | 4 +- .../utils/enumeration/PunishReasonEnum.java | 8 +- .../utils/enumeration/PunishType.java | 6 +- .../consensus/utils/manager/AgentManager.java | 34 +- .../consensus/utils/manager/BlockManager.java | 22 +- .../consensus/utils/manager/ChainManager.java | 52 +- .../utils/manager/CoinDataManager.java | 88 +- .../utils/manager/ConsensusManager.java | 124 +- .../utils/manager/DepositManager.java | 26 +- .../utils/manager/PunishManager.java | 110 +- .../consensus/utils/manager/RoundManager.java | 150 +- .../utils/manager/SchedulerManager.java | 6 +- .../utils/thread/ConsensusProcessTask.java | 2 +- .../thread/process/ConsensusProcess.java | 50 +- .../utils/validator/BatchValidator.java | 28 +- .../utils/validator/BlockValidator.java | 42 +- .../utils/validator/TxValidator.java | 122 +- .../nuls/contract/SmartContractBootStrap.java | 20 +- .../callable/ContractBatchEndCallable.java | 12 +- .../contract/callable/ContractTxCallable.java | 32 +- .../callable/ContractTxCallableV14.java | 22 +- .../callable/ContractTxCallableV8.java | 20 +- .../nuls/contract/config/ContractContext.java | 12 +- .../contract/constant/ContractConstant.java | 4 +- .../contract/constant/ContractDBConstant.java | 4 +- .../nuls/contract/enums/BatchInfoStatus.java | 2 +- .../io/nuls/contract/enums/BlockType.java | 2 +- .../nuls/contract/enums/CmdRegisterMode.java | 2 +- .../contract/enums/CmdRegisterReturnType.java | 2 +- .../nuls/contract/enums/ContractStatus.java | 2 +- .../enums/LedgerUnConfirmedTxStatus.java | 2 +- .../nuls/contract/enums/TokenTypeStatus.java | 4 +- .../helper/ContractConflictChecker.java | 2 +- .../nuls/contract/helper/ContractHelper.java | 48 +- .../ContractNewTxFromOtherModuleHandler.java | 44 +- .../contract/helper/ContractNewTxHandler.java | 22 +- .../helper/ContractTransferHandler.java | 50 +- .../contract/helper/ContractTxHelper.java | 100 +- .../nuls/contract/manager/ChainManager.java | 40 +- .../contract/manager/CmdRegisterManager.java | 48 +- .../manager/ContractTempBalanceManager.java | 6 +- .../ContractTxCreateUnconfirmedManager.java | 4 +- .../io/nuls/contract/model/bo/BatchInfo.java | 40 +- .../nuls/contract/model/bo/BatchInfoV8.java | 26 +- .../java/io/nuls/contract/model/bo/Chain.java | 26 +- .../contract/model/bo/ContractBalance.java | 4 +- .../contract/model/bo/ContractCreate.java | 2 +- .../model/bo/ContractInternalCreate.java | 8 +- .../model/bo/ContractMergedTransfer.java | 4 +- .../bo/ContractMultyAssetMergedTransfer.java | 4 +- .../contract/model/bo/ContractResult.java | 18 +- .../model/bo/ContractWrapperTransaction.java | 2 +- .../contract/model/dto/AccountAmountDto.java | 4 +- .../model/dto/CallContractDataDto.java | 16 +- .../model/dto/ContractAddressDto.java | 14 +- .../model/dto/ContractConstructorInfoDto.java | 4 +- .../contract/model/dto/ContractInfoDto.java | 32 +- .../model/dto/ContractInternalCreateDto.java | 8 +- .../dto/ContractInvokeRegisterCmdDto.java | 8 +- .../model/dto/ContractMergedTransferDto.java | 10 +- .../ContractMultyAssetMergedTransferDto.java | 14 +- .../contract/model/dto/ContractOutputDto.java | 6 +- .../contract/model/dto/ContractResultDto.java | 50 +- .../dto/ContractToken1155TransferDto.java | 14 +- .../dto/ContractToken721TransferDto.java | 10 +- .../model/dto/ContractTokenInfoDto.java | 18 +- .../model/dto/ContractTokenTransferDto.java | 14 +- .../model/dto/ContractTokenTransferInfo.java | 2 +- .../ContractTokenTransferTransactionDto.java | 24 +- .../model/dto/ContractTransactionDto.java | 40 +- .../model/dto/ContractTransferDataDto.java | 4 +- .../model/dto/CreateContractDataDto.java | 14 +- .../model/dto/DeleteContractDataDto.java | 4 +- .../io/nuls/contract/model/dto/InputDto.java | 12 +- .../model/dto/MultyAssetOutputDto.java | 10 +- .../io/nuls/contract/model/dto/OutputDto.java | 10 +- .../model/po/ContractAddressInfoPo.java | 2 +- .../model/po/ContractTokenTransferInfoPo.java | 2 +- .../processor/CallContractTxProcessor.java | 28 +- .../processor/CreateContractTxProcessor.java | 44 +- .../java/io/nuls/contract/rpc/CallHelper.java | 2 +- .../contract/rpc/call/ChainManagerCall.java | 2 +- .../io/nuls/contract/rpc/call/LedgerCall.java | 6 +- .../io/nuls/contract/rpc/cmd/ContractCmd.java | 144 +- .../rpc/cmd/ContractTransactionHandler.java | 24 +- .../rpc/resource/ContractResource.java | 356 +- .../nuls/contract/service/ResultHanlder.java | 2 +- .../service/impl/ContractCallerImpl.java | 4 +- .../service/impl/ContractExecutorImpl.java | 12 +- .../service/impl/ContractServiceImpl.java | 64 +- .../service/impl/ContractTxServiceImpl.java | 10 +- .../service/impl/ResultHandlerImpl.java | 12 +- .../ContractAddressStorageService.java | 12 +- .../ContractExecuteResultStorageService.java | 8 +- .../tx/SmartContractVersionChangeInvoker.java | 18 +- .../tx/common/TransactionCommitAdvice.java | 8 +- .../tx/common/TransactionRollbackAdvice.java | 4 +- .../contract/tx/v1/CallContractProcessor.java | 2 +- .../tx/v13/CallContractProcessorV13.java | 2 +- .../tx/v16/CallContractProcessorV16.java | 12 +- .../tx/v16/CreateContractProcessorV16.java | 4 +- .../tx/v8/CallContractProcessorV8.java | 2 +- .../io/nuls/contract/util/ContractUtil.java | 38 +- .../main/java/io/nuls/contract/util/Log.java | 54 +- .../java/io/nuls/contract/util/VMContext.java | 14 +- .../validator/CallContractTxValidator.java | 30 +- .../validator/CreateContractTxValidator.java | 2 +- .../java/io/nuls/contract/vm/GasCost.java | 48 +- .../main/java/io/nuls/contract/vm/Heap.java | 6 +- .../src/main/java/io/nuls/contract/vm/VM.java | 6 +- .../references/Invokespecial.java | 2 +- .../references/Invokevirtual.java | 4 +- .../io/nuls/contract/sdk/NativeAddress.java | 10 +- .../io/nuls/contract/sdk/NativeUtils.java | 62 +- .../nuls/contract/vm/program/ProgramCall.java | 22 +- .../contract/vm/program/ProgramCreate.java | 18 +- .../vm/program/ProgramInternalCall.java | 14 +- .../vm/program/ProgramInternalCreate.java | 10 +- .../contract/vm/program/ProgramMethod.java | 22 +- .../contract/vm/program/ProgramMethodArg.java | 8 +- .../contract/vm/program/ProgramResult.java | 2 +- .../vm/program/impl/ProgramExecutorImpl.java | 38 +- .../vm/program/impl/ProgramInvoke.java | 26 +- .../nuls/crosschain/CrossChainBootStrap.java | 14 +- .../base/constant/CommandConstant.java | 24 +- .../base/constant/CrossChainConstant.java | 4 +- .../base/constant/CrossChainErrorCode.java | 4 +- .../base/constant/ParamConstant.java | 2 +- .../base/message/BroadCtxHashMessage.java | 2 +- .../base/message/BroadCtxSignMessage.java | 2 +- .../base/message/CirculationMessage.java | 2 +- .../base/message/CrossTxRehandleMessage.java | 6 +- .../base/message/CtxStateMessage.java | 4 +- .../base/message/GetCirculationMessage.java | 2 +- .../base/message/GetCtxStateMessage.java | 4 +- .../base/message/GetOtherCtxMessage.java | 4 +- .../base/message/NewOtherCtxMessage.java | 6 +- .../base/message/base/BaseMessage.java | 2 +- .../message/handler/BroadCtxHashHandler.java | 2 +- .../message/handler/BroadCtxSignHandler.java | 2 +- .../base/message/handler/CtxStateHandler.java | 2 +- .../handler/GetCirculationHandler.java | 2 +- .../message/handler/GetCtxStateHandler.java | 2 +- .../message/handler/GetOtherCtxHandler.java | 2 +- .../message/handler/NewOtherCtxHandler.java | 2 +- .../crosschain/base/model/bo/AssetInfo.java | 12 +- .../crosschain/base/model/bo/ChainInfo.java | 20 +- .../crosschain/base/model/bo/Circulation.java | 2 +- .../model/bo/txdata/CrossTransferData.java | 8 +- .../bo/txdata/RegisteredChainChangeData.java | 4 +- .../bo/txdata/RegisteredChainMessage.java | 2 +- .../model/bo/txdata/VerifierChangeData.java | 2 +- .../model/bo/txdata/VerifierInitData.java | 2 +- .../base/model/dto/input/CoinDTO.java | 10 +- .../base/rpc/cmd/CrossChainCmd.java | 60 +- .../base/rpc/cmd/CrossChainProtocolCmd.java | 86 +- .../base/service/CrossChainService.java | 34 +- .../base/service/ProtocolService.java | 58 +- .../service/RegisteredChainChangeService.java | 6 +- .../base/service/ResetChainService.java | 6 +- .../service/ResetLocalVerifierService.java | 14 +- .../base/service/VerifierChangeTxService.java | 8 +- .../base/service/VerifierInitService.java | 8 +- .../tx/v1/ContractCrossChainProcessor.java | 2 +- .../base/tx/v1/CrossChainProcessor.java | 2 +- .../tx/v1/ResetLocalVerifierProcessor.java | 2 +- .../base/tx/v1/VerifierChangeProcessor.java | 2 +- .../base/tx/v1/VerifierInitProcessor.java | 2 +- .../base/utils/annotation/ResisterTx.java | 2 +- .../enumeration/ChainInfoChangeType.java | 6 +- .../base/utils/enumeration/TxMethodType.java | 8 +- .../base/utils/enumeration/TxProperty.java | 4 +- .../constant/NulsCrossChainConstant.java | 38 +- .../constant/NulsCrossChainErrorCode.java | 6 +- .../crosschain/constant/ParamConstant.java | 4 +- .../message/CirculationHandler.java | 2 +- .../message/CrossTxRehandleMsgHandler.java | 24 +- .../io/nuls/crosschain/model/bo/Chain.java | 70 +- .../crosschain/model/bo/CtxStateEnum.java | 8 +- .../io/nuls/crosschain/model/bo/NodeType.java | 2 +- .../model/bo/message/UntreatedMessage.java | 2 +- .../model/bo/txdata/CrossTxData.java | 6 +- .../nuls/crosschain/model/po/CtxStatusPO.java | 2 +- .../crosschain/model/po/SendCtxHashPO.java | 2 +- .../model/po/VerifierChangeSendFailPO.java | 2 +- .../nuls/crosschain/rpc/call/AccountCall.java | 16 +- .../nuls/crosschain/rpc/call/BlockCall.java | 4 +- .../crosschain/rpc/call/ChainManagerCall.java | 14 +- .../nuls/crosschain/rpc/call/CommonCall.java | 4 +- .../crosschain/rpc/call/ConsensusCall.java | 12 +- .../nuls/crosschain/rpc/call/LedgerCall.java | 12 +- .../nuls/crosschain/rpc/call/NetWorkCall.java | 32 +- .../rpc/call/SmartContractCall.java | 4 +- .../crosschain/rpc/call/TransactionCall.java | 4 +- .../nuls/crosschain/rpc/cmd/CcmBlockCmd.java | 14 +- .../crosschain/rpc/cmd/CrossChainTxCmd.java | 24 +- .../nuls/crosschain/rpc/cmd/MainNetCmd.java | 132 +- .../nuls/crosschain/servive/BlockService.java | 14 +- .../crosschain/servive/MainNetService.java | 22 +- .../servive/impl/BlockServiceImpl.java | 30 +- .../servive/impl/MainNetServiceImpl.java | 40 +- .../impl/NulsCrossChainServiceImpl.java | 44 +- .../servive/impl/NulsProtocolServiceImpl.java | 82 +- .../RegisteredChainChangeServiceImpl.java | 10 +- .../servive/impl/ResetChainServiceImpl.java | 8 +- .../impl/ResetLocalVerifierServiceImpl.java | 58 +- .../impl/VerifierChangeTxServiceImpl.java | 26 +- .../servive/impl/VerifierInitServiceImpl.java | 16 +- .../srorage/CommitedOtherCtxService.java | 34 +- .../crosschain/srorage/ConvertCtxService.java | 34 +- .../srorage/ConvertHashService.java | 34 +- .../srorage/CrossChangeBroadFailService.java | 32 +- .../crosschain/srorage/CtxStateService.java | 32 +- .../crosschain/srorage/CtxStatusService.java | 34 +- .../srorage/LocalVerifierService.java | 24 +- .../srorage/RegisteredCrossChainService.java | 14 +- .../crosschain/srorage/SendHeightService.java | 32 +- .../srorage/SendedHeightService.java | 32 +- .../VerifierChangeBroadFailedService.java | 32 +- .../imp/CommitedOtherCtxServiceImpl.java | 2 +- .../srorage/imp/ConvertCtxServiceImpl.java | 2 +- .../srorage/imp/ConvertHashServiceImpl.java | 2 +- .../srorage/imp/CtxStateServiceImpl.java | 2 +- .../srorage/imp/CtxStatusServiceImpl.java | 2 +- .../srorage/imp/LocalVerifierServiceImpl.java | 2 +- .../imp/RegisteredCrossChainServiceImpl.java | 8 +- .../srorage/imp/SendHeightServiceImpl.java | 2 +- .../srorage/imp/SendedHeightServiceImpl.java | 2 +- .../VerifierChangeBroadFailedServiceImpl.java | 2 +- .../nuls/crosschain/utils/BroadCtxUtil.java | 52 +- .../io/nuls/crosschain/utils/CommonUtil.java | 18 +- .../io/nuls/crosschain/utils/LoggerUtil.java | 6 +- .../io/nuls/crosschain/utils/MessageUtil.java | 216 +- .../java/io/nuls/crosschain/utils/TxUtil.java | 98 +- .../utils/manager/ChainManager.java | 82 +- .../utils/manager/CoinDataManager.java | 140 +- .../utils/manager/LocalVerifierManager.java | 10 +- .../utils/thread/CrossTxHandler.java | 4 +- .../ResetOtherChainVerifierListHandler.java | 2 +- .../utils/thread/VerifierChangeTxHandler.java | 34 +- .../thread/handler/GetCtxStateHandler.java | 2 +- .../thread/handler/HashMessageHandler.java | 4 +- .../handler/OtherCtxMessageHandler.java | 16 +- .../handler/SignMessageByzantineHandler.java | 4 +- .../utils/validator/CrossTxValidator.java | 58 +- .../io/nuls/ledger/constant/CmdConstant.java | 42 +- .../nuls/ledger/constant/LedgerConstant.java | 20 +- .../nuls/ledger/constant/LedgerErrorCode.java | 4 +- .../ledger/manager/LedgerChainManager.java | 20 +- .../io/nuls/ledger/model/FreezeLockState.java | 18 +- .../io/nuls/ledger/model/LedgerChain.java | 2 +- .../io/nuls/ledger/model/TempMaxAssetId.java | 2 +- .../io/nuls/ledger/model/ValidateResult.java | 4 +- .../io/nuls/ledger/model/po/AccountState.java | 26 +- .../model/po/AccountStateUnconfirmed.java | 16 +- .../model/po/BlockSnapshotAccounts.java | 2 +- .../ledger/model/po/BlockSnapshotTxs.java | 2 +- .../io/nuls/ledger/model/po/LedgerAsset.java | 2 +- .../nuls/ledger/model/po/TxUnconfirmed.java | 18 +- .../model/po/sub/AccountStateSnapshot.java | 8 +- .../nuls/ledger/model/po/sub/AmountNonce.java | 10 +- .../model/po/sub/FreezeHeightState.java | 8 +- .../model/po/sub/FreezeLockTimeState.java | 8 +- .../nuls/ledger/rpc/call/CallRpcService.java | 4 +- .../nuls/ledger/rpc/cmd/AccountStateCmd.java | 106 +- .../io/nuls/ledger/rpc/cmd/AssetsRegCmd.java | 54 +- .../ledger/rpc/cmd/AssetsRegContractCmd.java | 82 +- .../nuls/ledger/rpc/cmd/AssetsRegTxCmd.java | 64 +- .../io/nuls/ledger/rpc/cmd/BaseLedgerCmd.java | 4 +- .../io/nuls/ledger/rpc/cmd/ChainAssetCmd.java | 60 +- .../ledger/rpc/cmd/LgmTransactionCmd.java | 76 +- .../io/nuls/ledger/rpc/cmd/ValidatorCmd.java | 68 +- .../ledger/service/AccountStateService.java | 8 +- .../ledger/service/AssetRegMngService.java | 2 +- .../nuls/ledger/service/BlockDataService.java | 8 +- .../ledger/service/FreezeStateService.java | 2 +- .../ledger/service/TransactionService.java | 16 +- .../service/UnconfirmedStateService.java | 8 +- .../service/impl/AccountStateServiceImpl.java | 16 +- .../service/impl/AssetRegMngServiceImpl.java | 18 +- .../service/impl/BlockDataServiceImpl.java | 30 +- .../service/impl/ChainAssetsServiceImpl.java | 6 +- .../service/impl/FreezeStateServiceImpl.java | 18 +- .../service/impl/TransactionServiceImpl.java | 106 +- .../impl/UnconfirmedStateServiceImpl.java | 30 +- .../CommontTransactionProcessor.java | 2 +- .../processor/LockedTransactionProcessor.java | 32 +- .../service/processor/TxCommonProcessor.java | 6 +- .../service/processor/TxLockedProcessor.java | 2 +- .../v15/AssetRegTransferProcessor.java | 2 +- .../service/v5/AssetRegTransferProcessor.java | 2 +- .../storage/AccountIndexRepository.java | 2 +- .../ledger/storage/AssetRegMngRepository.java | 2 +- .../CrossChainAssetRegMngRepository.java | 2 +- .../io/nuls/ledger/storage/DataBaseArea.java | 20 +- .../ledger/storage/LgBlockSyncRepository.java | 20 +- .../io/nuls/ledger/storage/Repository.java | 22 +- .../impl/AccountIndexRepositoryImpl.java | 2 +- .../impl/AssetRegMngRepositoryImpl.java | 2 +- .../impl/LgBlockSyncRepositoryImpl.java | 2 +- .../ledger/storage/impl/RepositoryImpl.java | 6 +- .../impl/UnconfirmedRepositoryImpl.java | 8 +- .../java/io/nuls/ledger/utils/LedgerUtil.java | 4 +- .../java/io/nuls/ledger/utils/LoggerUtil.java | 2 +- .../ledger/validator/CoinDataValidator.java | 230 +- .../io/nuls/network/NetworkBootstrap.java | 8 +- .../io/nuls/network/constant/CmdConstant.java | 38 +- .../network/constant/ManagerStatusEnum.java | 18 +- .../network/constant/NetworkConstant.java | 20 +- .../network/constant/NetworkErrorCode.java | 4 +- .../constant/NodeConnectStatusEnum.java | 14 +- .../nuls/network/constant/NodeStatusEnum.java | 10 +- .../java/io/nuls/network/locker/Lockers.java | 4 +- .../io/nuls/network/manager/BaseManager.java | 8 +- .../network/manager/ConnectionManager.java | 32 +- .../nuls/network/manager/MessageFactory.java | 10 +- .../nuls/network/manager/MessageManager.java | 20 +- .../network/manager/NodeGroupManager.java | 28 +- .../nuls/network/manager/StorageManager.java | 2 +- .../io/nuls/network/manager/TaskManager.java | 4 +- .../io/nuls/network/manager/TimeManager.java | 54 +- .../handler/MessageHandlerFactory.java | 2 +- .../handler/base/BaseMeesageHandlerInf.java | 4 +- .../handler/base/BaseMessageHandler.java | 2 +- .../handler/message/AddrMessageHandler.java | 12 +- .../message/GetAddrMessageHandler.java | 6 +- .../message/GetTimeMessageHandler.java | 4 +- .../message/OtherModuleMessageHandler.java | 2 +- .../message/PeerInfoMessageHandler.java | 4 +- .../handler/message/PingMessageHandler.java | 2 +- .../handler/message/TimeMessageHandler.java | 4 +- .../handler/message/VerackMessageHandler.java | 8 +- .../message/VersionMessageHandler.java | 48 +- .../main/java/io/nuls/network/model/Node.java | 16 +- .../java/io/nuls/network/model/NodeGroup.java | 50 +- .../network/model/message/AddrMessage.java | 2 +- .../network/model/message/ByeMessage.java | 2 +- .../network/model/message/GetAddrMessage.java | 2 +- .../network/model/message/GetTimeMessage.java | 2 +- .../model/message/PeerInfoMessage.java | 2 +- .../network/model/message/PingMessage.java | 2 +- .../network/model/message/PongMessage.java | 2 +- .../network/model/message/TimeMessage.java | 2 +- .../network/model/message/VerackMessage.java | 2 +- .../model/message/base/BaseMessage.java | 4 +- .../model/message/base/MessageHeader.java | 12 +- .../model/message/body/AddrMessageBody.java | 4 +- .../message/body/GetTimeMessageBody.java | 2 +- .../message/body/PeerInfoMessageBody.java | 2 +- .../message/body/PingPongMessageBody.java | 2 +- .../model/message/body/TimeMessageBody.java | 2 +- .../nuls/network/model/po/GroupNodesPo.java | 4 +- .../io/nuls/network/model/po/GroupPo.java | 10 +- .../java/io/nuls/network/model/po/NodePo.java | 4 +- .../io/nuls/network/model/vo/NodeGroupVo.java | 30 +- .../java/io/nuls/network/model/vo/NodeVo.java | 22 +- .../netty/container/NodesContainer.java | 6 +- .../netty/handler/ServerChannelHandler.java | 2 +- .../network/rpc/call/BlockRpcService.java | 4 +- .../rpc/call/impl/BlockRpcServiceImpl.java | 4 +- .../io/nuls/network/rpc/cmd/MessageRpc.java | 62 +- .../nuls/network/rpc/cmd/NetworkInfoRpc.java | 40 +- .../io/nuls/network/rpc/cmd/NodeGroupRpc.java | 110 +- .../java/io/nuls/network/rpc/cmd/NodeRpc.java | 58 +- .../nuls/network/rpc/cmd/TimeServiceRpc.java | 8 +- .../java/io/nuls/network/storage/InitDB.java | 2 +- .../nuls/network/task/GroupStatusMonitor.java | 12 +- .../io/nuls/network/task/HeartBeatTask.java | 2 +- .../nuls/network/task/LocalInfosSendTask.java | 4 +- .../nuls/network/task/NodeDiscoverTask.java | 52 +- .../network/task/NodeMaintenanceTask.java | 10 +- .../nuls/network/task/NwInfosPrintTask.java | 2 +- .../network/task/PeerCacheMsgSendTask.java | 4 +- .../network/task/RPCCacheMsgSendTask.java | 4 +- .../nuls/network/task/SaveNodeInfoTask.java | 4 +- .../nuls/network/task/ShareAddressTask.java | 10 +- .../java/io/nuls/network/task/TimeTask.java | 6 +- .../java/io/nuls/network/utils/IpUtil.java | 4 +- .../io/nuls/network/utils/MessageUtil.java | 2 +- .../protocol/ProtocolUpdateBootstrap.java | 8 +- .../protocol/constant/CommandConstant.java | 16 +- .../io/nuls/protocol/constant/Constant.java | 18 +- .../protocol/constant/ProtocolErrorCode.java | 6 +- .../nuls/protocol/manager/ChainManager.java | 14 +- .../nuls/protocol/manager/ContextManager.java | 6 +- .../nuls/protocol/model/ProtocolContext.java | 30 +- .../protocol/model/po/ProtocolVersionPo.java | 12 +- .../protocol/model/po/StatisticsInfo.java | 12 +- .../nuls/protocol/rpc/ProtocolResource.java | 52 +- .../rpc/call/VersionChangeNotifier.java | 4 +- .../protocol/service/ProtocolService.java | 24 +- .../service/impl/ProtocolServiceImpl.java | 70 +- .../ProtocolVersionStorageService.java | 30 +- .../storage/StatisticsStorageService.java | 34 +- .../ProtocolVersionStorageServiceImpl.java | 2 +- .../impl/StatisticsStorageServiceImpl.java | 2 +- .../io/nuls/protocol/utils/ConfigLoader.java | 8 +- .../io/nuls/protocol/utils/LoggerUtil.java | 4 +- .../java/io/nuls/protocol/utils/PoUtil.java | 2 +- .../transaction/TransactionBootstrap.java | 6 +- .../nuls/transaction/cache/PackablePool.java | 20 +- .../io/nuls/transaction/constant/TxCmd.java | 10 +- .../nuls/transaction/constant/TxConstant.java | 40 +- .../nuls/transaction/constant/TxContext.java | 2 +- .../transaction/constant/TxDBConstant.java | 8 +- .../transaction/manager/ChainManager.java | 26 +- .../transaction/manager/SchedulerManager.java | 8 +- .../nuls/transaction/manager/TxManager.java | 14 +- .../message/BroadcastTxMessage.java | 4 +- .../transaction/message/ForwardTxMessage.java | 8 +- .../transaction/message/GetTxMessage.java | 4 +- .../handler/BroadcastTxMessageHandler.java | 14 +- .../handler/ForwardTxMessageHandler.java | 10 +- .../message/handler/GetTxMessageHandler.java | 4 +- .../io/nuls/transaction/model/bo/Chain.java | 38 +- .../transaction/model/bo/OrphanSortItem.java | 2 +- .../model/bo/OrphanSortResult.java | 2 +- .../io/nuls/transaction/model/bo/Orphans.java | 16 +- .../nuls/transaction/model/bo/TxPackage.java | 2 +- .../model/bo/TxPackageWrapper.java | 2 +- .../nuls/transaction/model/bo/TxRegister.java | 10 +- .../transaction/model/bo/TxVerifyWrapper.java | 2 +- .../model/bo/VerifyLedgerResult.java | 8 +- .../transaction/model/bo/VerifyResult.java | 2 +- .../nuls/transaction/model/dto/CoinDTO.java | 6 +- .../model/dto/ModuleTxRegisterDTO.java | 6 +- .../model/po/TransactionConfirmedPO.java | 2 +- .../model/po/TransactionNetPO.java | 4 +- .../model/po/TransactionUnconfirmedPO.java | 4 +- .../transaction/rpc/call/AccountCall.java | 4 +- .../transaction/rpc/call/ContractCall.java | 20 +- .../nuls/transaction/rpc/call/LedgerCall.java | 30 +- .../transaction/rpc/call/NetworkCall.java | 30 +- .../transaction/rpc/call/TransactionCall.java | 22 +- .../nuls/transaction/rpc/cmd/ClientCmd.java | 40 +- .../transaction/rpc/cmd/TransactionCmd.java | 268 +- .../rpc/upgrade/TxVersionChangeInvoker.java | 26 +- .../service/ConfirmedTxService.java | 22 +- .../nuls/transaction/service/TxService.java | 28 +- .../service/impl/ConfirmedTxServiceImpl.java | 72 +- .../service/impl/TxServiceImpl.java | 736 ++-- .../storage/ConfirmedTxStorageService.java | 42 +- .../storage/UnconfirmedTxStorageService.java | 38 +- .../impl/ConfirmedTxStorageServiceImpl.java | 8 +- .../impl/UnconfirmedTxStorageServiceImpl.java | 10 +- .../task/ClearUnconfirmedTxProcessTask.java | 14 +- .../transaction/task/NetTxProcessTask.java | 24 +- .../transaction/task/OrphanTxProcessTask.java | 38 +- .../io/nuls/transaction/utils/OrphanSort.java | 24 +- .../transaction/utils/TxDuplicateRemoval.java | 6 +- .../io/nuls/transaction/utils/TxUtil.java | 50 +- .../org/ethereum/datasource/BloomFilter.java | 2 +- .../datasource/rocksdb/RocksDbDataSource.java | 6 +- .../main/java/org/ethereum/util/ByteUtil.java | 2 +- .../org/ethereum/util/CopyOnWriteMap.java | 2 +- .../main/java/org/ethereum/util/Utils.java | 2 +- .../main/resources/block/genesis-block.json | 2 +- .../src/main/resources/contract/nrc1155.json | 2 +- .../src/main/resources/contract/nrc20.json | 2 +- .../src/main/resources/contract/nrc721.json | 2 +- .../nuls-cores/src/main/resources/module.json | 2 +- .../src/main/resources/protocol-config.json | 2 +- .../src/main/resources/protocol/versions.json | 2 +- .../io/nuls/account/ServiceInitializer.java | 2 +- .../test/java/io/nuls/account/WsKernel.java | 2 +- .../nuls/account/rpc/cmd/AccountCmdTest.java | 122 +- .../account/rpc/cmd/TransactionCmdTest.java | 88 +- .../rpc/common/CommonRpcOperation.java | 12 +- .../service/AccountKeyStoreServiceTest.java | 24 +- .../account/service/AccountServiceTest.java | 18 +- .../account/service/AliasServiceTest.java | 8 +- .../storage/AccountStorageServiceTest.java | 10 +- .../storage/AliasStorageServiceTest.java | 12 +- .../java/io/nuls/account/tx/CreateTx.java | 40 +- .../java/io/nuls/account/tx/Transfer.java | 46 +- .../test/java/io/nuls/account/tx/TxTest.java | 8 +- .../io/nuls/account/util/AddressToolTest.java | 4 +- .../nuls/account/util/PreconditionsTest.java | 2 +- .../io/nuls/block/BlockGeneratorTest.java | 64 +- .../test/java/io/nuls/block/CommonTest.java | 2 +- .../nuls/block/config/GenesisBlockTest.java | 6 +- .../block/manager/BlockChainManagerTest.java | 4 +- .../nuls/block/message/BlockMessageTest.java | 2 +- .../block/message/MessageHandlerTest.java | 4 +- .../io/nuls/block/message/MessageTest.java | 10 +- .../handler/SmallBlockHandlerTest.java | 2 +- .../java/io/nuls/block/model/ChainTest.java | 4 +- .../io/nuls/block/rpc/BlockResourceTest.java | 4 +- .../impl/ChainStorageServiceImplTest.java | 4 +- .../storage/BlockStorageServiceImplTest.java | 2 +- .../block/thread/BlockDownloaderTest.java | 6 +- .../block/thread/BlockSynchronizerTest.java | 8 +- .../thread/monitor/ForkChainsMonitorTest.java | 4 +- .../java/io/nuls/chain/test/ChainCmdTest.java | 2 +- .../io/nuls/consensus/CmdPriorityTest.java | 2 +- .../test/java/io/nuls/consensus/TestUtil.java | 6 +- .../java/io/nuls/consensus/rpc/AgentTest.java | 26 +- .../io/nuls/consensus/rpc/ConsensusTest.java | 26 +- .../io/nuls/consensus/rpc/DepositTest.java | 14 +- .../java/io/nuls/consensus/rpc/WsKernel.java | 2 +- .../consensus/storage/AgentStorageTest.java | 2 +- .../io/nuls/consensus/utils/MerkleTest.java | 2 +- .../test/java/io/nuls/contract/base/Base.java | 2 +- .../contract/crypto/ecies/ECIESFinalTest.java | 4 +- .../deserialization/TxDeserialization.java | 72 +- .../nuls/contract/mock/basetest/MockBase.java | 2 +- .../nuls/contract/mock/basetest/VoteTest.java | 30 +- .../ContractMergeContractTransferTest.java | 16 +- .../mock/contractvm/ContractVmTest.java | 438 +-- .../mock/contractvm/ContractVmV8Test.java | 148 +- .../mock/helper/ContractHelperMock.java | 2 +- ...ntractNewTxFromOtherModuleHandlerMock.java | 2 +- .../InvokeExternalCmdLocalTest.java | 16 +- .../nuls/contract/mock/nrc721/NRC721Test.java | 156 +- .../mock/pocm/ContractPOCMLocalTest.java | 2 +- .../LoadLargeContractTest.java | 6 +- .../StorageStructureContract.java | 8 +- .../io/nuls/contract/tx/base/BaseQuery.java | 22 +- .../tx/consensus/ConsensusSendTxTest.java | 36 +- .../ContractCreateSendTxTest.java | 4 +- .../ContractCallContractQueryTest.java | 28 +- .../ContractCallContractSendTxTest.java | 20 +- .../tx/contractvm/ContractVmSendTxTest.java | 408 +- .../tx/contractvm/ContractVmV8SendTxTest.java | 176 +- .../ContractMakeAndBroadcastBase.java | 32 +- .../ContractMakeAndBroadcastTxTest.java | 70 +- .../tx/multiSign/MultiSignTxTest.java | 12 +- .../tx/multyasset/ContractMultyAssetTest.java | 88 +- .../tx/multytx/ContractMultyTxTest.java | 24 +- .../tx/nrc20/ContractNRC20TokenQueryTest.java | 26 +- .../nrc20/ContractNRC20TokenSendTxTest.java | 20 +- .../ContractNRC20CrossTokenSendTxTest.java | 42 +- .../nrc721/ContractNRC721TokenSendTxTest.java | 4 +- .../ContractMultyAssetOfflineTest.java | 26 +- .../tx/pocm/ContractPOCMSendTxTest.java | 72 +- .../tx/randomseed/RandomSeedSendTxTest.java | 4 +- .../StorageStructureSendTxTest.java | 6 +- .../tx/temp/ContractTempSendTxTest.java | 4 +- .../contract/util/ContractDBUtilTest.java | 2 +- .../io/nuls/contract/util/VMContextMock.java | 2 +- .../nuls/crosschain/TestVerifierChange.java | 2 +- .../nuls/crosschain/datacheck/SignCheck.java | 2 +- .../datacheck/TransactionCheck.java | 2 +- .../io/nuls/crosschain/resend/ReadCtx.java | 2 +- .../io/nuls/crosschain/rpc/AccountTest.java | 8 +- .../crosschain/rpc/NulsCrossChainTest.java | 8 +- .../io/nuls/crosschain/rpc/util/CallUtil.java | 2 +- .../crosschain/storage/NewCtxServiceTest.java | 4 +- .../storage/SendHeightServiceTest.java | 4 +- .../nuls/ledger/test/cmd/CmdChainAsset.java | 2 +- .../nuls/ledger/test/cmd/CmdGenesisAsset.java | 4 +- .../nuls/ledger/test/cmd/CmdRollBackTest.java | 4 +- .../java/io/nuls/ledger/test/cmd/CmdTest.java | 2 +- .../io/nuls/ledger/test/cmd/CmdTxTest.java | 26 +- .../ledger/test/cmd/CmdUnconfirmedTxTest.java | 20 +- .../nuls/ledger/test/cmd/CmdValidateTest.java | 6 +- .../ledger/test/cmd/CmdWrongDataTest.java | 10 +- .../java/io/nuls/ledger/test/cmd/HexTest.java | 4 +- .../src/test/java/io/nuls/network/Test1.java | 8 +- .../manager/threads/MessageSendTaskTest.java | 8 +- .../network/manager/threads/ThreadTest2.java | 2 +- .../nuls/network/other/AtomicIntegerTest.java | 2 +- .../network/rpc/ProtocolRegisterTest.java | 4 +- .../protocol/model/ProtocolVersionTest.java | 2 +- .../protocol/model/po/StatisticsInfoTest.java | 2 +- .../rpc/callback/BlockHeaderInvokeTest.java | 86 +- .../transaction/BatchCreateAgentTest.java | 10 +- .../io/nuls/transaction/CreateTxThread.java | 4 +- .../io/nuls/transaction/TestCommonUtil.java | 10 +- .../io/nuls/transaction/TestConstant.java | 8 +- .../java/io/nuls/transaction/TestJyc.java | 4 +- .../test/java/io/nuls/transaction/TestTx.java | 68 +- .../java/io/nuls/transaction/TxMultiSig.java | 32 +- .../java/io/nuls/transaction/TxValid.java | 190 +- .../ConfirmedTxStorageServiceTest.java | 10 +- .../UnconfirmedTxStorageServiceTest.java | 8 +- .../rocksdb/RocksDBPerformanceTest.java | 22 +- .../nuls/transaction/token/TestJSONObj.java | 8 +- .../java/io/nuls/transaction/tx/CreateTx.java | 38 +- .../nuls/transaction/tx/EntitySortTest.java | 8 +- .../java/io/nuls/transaction/tx/Transfer.java | 8 +- .../io/nuls/transaction/tx/TxCompareTest.java | 44 +- .../io/nuls/transaction/tx/TxCompareTool.java | 10 +- .../io/nuls/transaction/tx/TxSignTest.java | 4 +- .../utils/HashSetDuplicateProcessorTest.java | 20 +- .../src/test/resources/account/module.json | 2 +- .../resources/account/protocol-config.json | 2 +- .../test/resources/transaction/alpha2.json | 2 +- .../src/test/resources/transaction/beta1.json | 2 +- .../src/test/resources/transaction/beta2.json | 2 +- .../io/nuls/mykernel/MyKernelBootstrap.java | 40 +- test/mykernel/src/main/resources/module.json | 2 +- .../HandshakeTestBySingleThread.java | 6 +- .../InvokeTestBySingleThread.java | 4 +- .../RequestAndResponseTestByMultiThread.java | 6 +- .../RequestAndResponseTestBySingleThread.java | 4 +- .../test/java/io.nuls.mykernel/SyncTest.java | 2 +- .../src/main/java/io/nuls/test/Config.java | 2 +- .../src/main/java/io/nuls/test/Test.java | 2 +- .../main/java/io/nuls/test/TestModule.java | 12 +- .../io/nuls/test/TestModuleBootstrap.java | 2 +- .../java/io/nuls/test/cases/BaseAdapter.java | 2 +- .../java/io/nuls/test/cases/BaseTestCase.java | 2 +- .../nuls/test/cases/CallRemoteTestCase.java | 4 +- .../java/io/nuls/test/cases/CaseType.java | 2 +- .../java/io/nuls/test/cases/Constants.java | 2 +- .../io/nuls/test/cases/RemoteTestParam.java | 2 +- .../io/nuls/test/cases/ReturnNullCase.java | 2 +- .../java/io/nuls/test/cases/SleepAdapter.java | 4 +- .../nuls/test/cases/SyncRemoteTestCase.java | 8 +- .../java/io/nuls/test/cases/TestCase.java | 2 +- .../io/nuls/test/cases/TestCaseChain.java | 2 +- .../java/io/nuls/test/cases/TestCaseIntf.java | 16 +- .../io/nuls/test/cases/TestFailException.java | 2 +- .../nuls/test/cases/account/AccountCase.java | 26 +- .../test/cases/account/BackupAccountCase.java | 4 +- .../test/cases/account/BaseAccountCase.java | 2 +- .../test/cases/account/CreateAccountCase.java | 6 +- .../account/GetAccountByAddressCase.java | 8 +- .../cases/account/GetAccountListCase.java | 6 +- .../cases/account/GetAccountPriKeyCase.java | 4 +- .../GetAddressByAccountInfoAdapder.java | 4 +- .../account/ImportAccountByPriKeyCase.java | 4 +- .../account/ImportAccountKeystoreCase.java | 8 +- .../test/cases/account/RemoveAccountCase.java | 6 +- .../test/cases/account/SyncAccountInfo.java | 18 +- .../cases/account/UpdatePasswordCase.java | 4 +- .../block/BlockAbstractRemoteTestCase.java | 2 +- .../io/nuls/test/cases/block/BlockCase.java | 22 +- .../cases/block/GetBlockHeaderByHashCase.java | 6 +- .../block/GetBlockHeaderByHeightCase.java | 6 +- .../cases/block/GetLastBlockHeaderCase.java | 4 +- .../block/SyncGetBlockHeaderByHashCase.java | 8 +- .../block/SyncGetBlockHeaderByHeightCase.java | 8 +- .../block/SyncGetLastBlockHeaderCase.java | 8 +- .../ledger/GetAccountBalanceByPriKeyCase.java | 4 +- .../test/cases/ledger/SyncAccountBalance.java | 22 +- .../cases/transcation/AliasTransferCase.java | 14 +- .../transcation/BaseTranscationCase.java | 2 +- .../transcation/BatchFatigueTxsCase.java | 4 +- .../cases/transcation/CheckAliasCase.java | 6 +- .../GetTranscationFormAddressAdapter.java | 4 +- .../GetTranscationToAddressAdapter.java | 4 +- .../test/cases/transcation/GetTxInfoCase.java | 6 +- .../ReadyBalanceToAddressAdapter.java | 4 +- .../test/cases/transcation/SetAliasCase.java | 4 +- .../transcation/SingleTokenTransferCase.java | 2 +- .../cases/transcation/SyncTxInfoCase.java | 8 +- .../cases/transcation/TransactionCase.java | 4 +- .../transcation/TransferByAliasCase.java | 6 +- .../test/cases/transcation/TransferCase.java | 20 +- .../transcation/TransferToAddressCase.java | 4 +- .../batch/BatchBaseContractCase.java | 6 +- .../batch/BatchCreateAccountCase.java | 8 +- .../batch/BatchCreateAccountCase2.java | 10 +- .../batch/BatchCreateTransferCase.java | 10 +- .../batch/BatchCreateTransferCase2.java | 10 +- .../cases/transcation/batch/BatchParam.java | 2 +- .../batch/BatchReadyNodeAccountCase.java | 10 +- .../batch/BatchReadyNodeAccountCase2.java | 24 +- .../transcation/batch/BatchTestCase.java | 4 +- .../transcation/batch/BatchTestCase2.java | 4 +- .../batch/BatchTokenContractCase.java | 4 +- .../cases/transcation/batch/BatchTxsCase.java | 54 +- .../transcation/batch/DebugBatchTestCase.java | 4 +- .../batch/fasttx/AccountConstant.java | 44 +- .../batch/fasttx/AccountStatus.java | 4 +- .../transcation/batch/fasttx/CreateTx.java | 42 +- .../batch/fasttx/LedgerCmdCall.java | 4 +- .../transcation/batch/fasttx/RpcConstant.java | 54 +- .../transcation/batch/fasttx/model/Chain.java | 8 +- .../batch/fasttx/model/CoinDto.java | 6 +- .../batch/fasttx/model/ConfigBean.java | 4 +- .../batch/fasttx/model/ConfigItem.java | 2 +- .../transcation/constant/TxConstant.java | 40 +- .../contract/CallContractCase.java | 2 +- .../contract/CreateContractCase.java | 2 +- .../token/CreateTokenContractParamCase.java | 2 +- .../contract/token/TokenApproveParamCase.java | 2 +- .../token/TokenTransferParamCase.java | 2 +- .../nuls/test/controller/RemoteCaseReq.java | 2 +- .../io/nuls/test/controller/RemoteResult.java | 2 +- .../test/controller/RemoteTestController.java | 4 +- .../main/java/io/nuls/test/utils/Utils.java | 2 +- useguide.md | 228 +- 1516 files changed, 23415 insertions(+), 23414 deletions(-) mode change 100755 => 100644 config/genesis-block.beta.json mode change 100755 => 100644 config/nuls.beta.ncf mode change 100755 => 100644 "module/nuls-cmd-client/document/\351\223\276\347\256\241\347\220\206\346\250\241\345\235\227CMD\346\216\245\345\217\243-V1.md" diff --git a/.gitignore b/.gitignore index 276b3a5dc4..27d04e5987 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ NULS-Wallet-linux64-alpha* genesis-block_*.json module_*.ncf nuls-v2.zip +*.w diff --git a/README.md b/README.md index d804449bb3..5ef308288b 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ Modules added in the future may be released under a different license specified - [Facebook](https://www.facebook.com/nulscommunity/) - [YouTube channel](https://www.youtube.com/channel/UC8FkLeF4QW6Undm4B3InN1Q?view_as=subscriber) - Telegram [NULS Community](https://t.me/Nulsio) -- Telegram [NULS 中文社区](https://t.me/Nulscn) +- Telegram [NULS Chinese community](https://t.me/Nulscn) #### diff --git a/build/default-config.ncf b/build/default-config.ncf index 86ddd3cbf3..6ceb719a91 100644 --- a/build/default-config.ncf +++ b/build/default-config.ncf @@ -4,105 +4,105 @@ language=en logPath=Logs logLevel=INFO dataPath=data -#默认本链ID +#Default This ChainID chainId=2 -#地址前缀 +#Address prefix addressPrefix=tNULS -#默认本链主资产ID +#Default main asset of this chainID assetId=1 -#默认链名称 +#Default Chain Name chainName=nuls2 -#本链默认资产符号 +#The default asset symbol for this chain symbol=NULS -#默认资产的小数精确位数 +#The exact decimal places of default assets decimals=8 -#主网链id +#Main network chainid mainChainId=2 -#主网主资产id +#Main network assetsid mainAssetId=1 -#主网主资产符号 +#Main network main asset symbol mainSymbol=NULS blackHolePublicKey=000000000000000000000000000000000000000000000000000000000000000000 [network] port=18001 crossPort=18002 -#魔法参数 +#Magic parameters packetMagic=20190917 -#种子节点 +#Seed node selfSeedIps=39.98.226.51:18001,47.244.186.65:18001,47.254.234.223:18001,47.74.86.85:18001,192.168.1.145:18001 -#主网的跨链种子连接节点 +#Cross chain seed connection nodes of the main network moonSeedIps=39.98.226.51:18002,47.244.186.65:18002,47.254.234.223:18002,47.74.86.85:18002 -#最大入网连接数 +#Maximum number of network connections maxInCount=100 -#最大出网连接数 +#Maximum number of outbound connections maxOutCount=20 [account] keystoreFolder=/keystore/backup [block] -#区块最大字节数 +#Maximum number of bytes in a block blockMaxSize=5242880 -#区块扩展字段最大字节数 +#Maximum number of bytes for block extension fields extendMaxSize=1024 -#引发分叉链切换的高度差阈值 +#Threshold of height difference that triggers fork chain switching chainSwtichThreshold=3 -#最小链接节点数,当链接到的网络节点低于此参数时,会持续等待 +#Minimum number of linked nodes,When the network node linked to is below this parameter,Will continue to wait minNodeAmount=2 -#区块同步过程中,每次从网络上节点下载的区块数量 +#During block synchronization process,The number of blocks downloaded from nodes on the network each time downloadNumber=10 -#从网络节点下载单个区块的超时时间 +#The timeout for downloading a single block from a network node singleDownloadTimeout=15000 -#区块同步过程中缓存的区块字节数上限(20M) +#Maximum number of cached block bytes during block synchronization process(20M) cachedBlockSizeLimit=20971520 -#创世块文件路径(支持绝对路径与相对路径,相对路径相对于此配置文件的目录) +#Genesis block file path(Supports absolute and relative paths,Relative path relative to the directory of this configuration file) genesisBlockPath=genesis-block.json [consensus] -#种子节点列表 +#Seed node list seedNodes=tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp,tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe,tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF -#出块地址密码 +#Block address password password=nuls123456 -#出块间隔时间(单位：s) +#Block output interval time(unit：s) packingInterval=10 -#共识委托抵押资产链ID +#Consensus entrusted mortgage asset chainID agentChainId=2 -#共识委托抵押资产ID +#Consensus entrusted mortgage assetsID agentAssetId=1 -#共识奖励资产ID(共识奖励必须为本链资产) +#Consensus reward assetsID(Consensus rewards must be assets of the same chain) awardAssetId=1 -#共识交易手续费单价 +#Consensus transaction fee unit price feeUnit=100000 -#总通胀量 +#Total Inflation totalInflationAmount=11000000000000000 -#初始通胀金额500w/265*30 +#Initial inflation amount500w/265*30 inflationAmount=41095890410959 -#通胀开始计算时间(单位:S)2020-07-12 00:00:00 +#Inflation start calculation time(unit:S)2020-07-12 00:00:00 initTime=1594483200 -#通缩比例(如果没有通缩则设为100) +#Deflationary ratio(If there is no deflation, set to100) deflationRatio=99.6 -#通缩间隔时间(单位：S),30天 +#Deflation interval time(unit：S),30day deflationTimeInterval=2592000 [smart-contract] -#合约视图方法调用最大消耗的Gas +#The maximum consumption of contract view method callsGas maxViewGas=100000000 [public-service] -#public-service模块对外的rpc端口号 +#public-serviceModule ExternalrpcPort number rpcPort=18003 -#数据库url地址 +#databaseurladdress databaseUrl=127.0.0.1 -#数据库端口号 +#Database port number databasePort=27017 -#连接池最大数 +#Maximum number of connection pools maxAliveConnect=20 -#连接最大等待时间 +#Maximum waiting time for connection maxWaitTime=120000 -#连接最大持续时间 +#Maximum duration of connection socketTimeout=300000 -#连接超时时间 +#Connection timeout connectTimeOut=30000 developerNodeAddress=tNULSeBaMuKuKY4UstKpXvGxd7LEvEBtd3NXAG,tNULSeBaMns1C6kTePxcQS7rGAu37foAwAMpri ambassadorNodeAddress=tNULSeBaMhWyQBHc54oXLXB13WhJsyrTobMYYU,tNULSeBaMtCmUuBHMDAjKVSoVBsAEvLoWCspyE @@ -112,27 +112,27 @@ teamAddress=tNULSeBaMqTvaS2NEEZfdrmPzoRvd8zN6T57LH communityAddress=tNULSeBaMm9RQLKKUBXKJ1rQ7g4iobmWAB73mS [cross-chain] -#跨链节点链接的最小值 +#The minimum value of cross chain node links minNodeAmount=2 -#跨链节点链接的最大值 +#Maximum value of cross chain node links sendHeight=6 -#跨链交易拜占庭比例 +#Byzantine proportion of cross chain transactions byzantineRatio=66 -#主网跨链种子节点列表 +#Main network cross chain seed node list crossSeedIps=39.98.226.51:18002,47.244.186.65:18002,47.254.234.223:18002,47.74.86.85:18002,192.168.1.145:18002 -#主网验证人列表 +#List of main network validators verifiers=tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp,tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF,tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe -#主网签名拜占庭比列 +#Main network signature Byzantine comparison mainByzantineRatio=66 -#主网最大签名数 +#Maximum number of signatures on the main network maxSignatureCount=100 [nuls-api] -#httpServer的启动ip +#httpServerStart ofip serverIp=127.0.0.1 -#httpServer的启动port +#httpServerStart ofport serverPort=18004 [protocol-update] -#每隔多少个区块统计一次协议占比 -interval=10 \ No newline at end of file +#How many blocks do we count the proportion of protocols per second +interval=10 diff --git a/build/genesis-block.json b/build/genesis-block.json index 73df514ef6..a30bdf4918 100644 --- a/build/genesis-block.json +++ b/build/genesis-block.json @@ -11,4 +11,4 @@ "extend": "01000000010076c8775d0100010001005a64002056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "remark": "4f70656e2c204c69626572616c2c204175746f6e6f6d6f75732c2053656c662d45766f6c76696e670ae5bc80e694beefbc8ce887aae794b1efbc8ce887aae6b2bbefbc8ce8bf9be58c960a4f75766572742c204c696272652c204175746f6e6f6d652c20c389766f6c757469660ae382aae383bce38397e383b3e38081e38395e383aae383bce38081e887aae6b2bbe38081e980b2e58c960ad09ed182d0bad180d18bd182d18bd0b92c20d0a1d0b2d0bed0b1d0bed0b4d0bdd0b0d18f2c20d090d0b2d182d0bed0bdd0bed0bcd0bdd0b0d18f2c20d18dd0b2d0bed0bbd18ed186d0b8d18f0aeab09cebb0a9eca0812020eca784ebb3b4eca08120ec9e90ec9ca8eca08120ed9881ebaa85eca0810a4162696572746f2c204c696272652c20417574c3b36e6f6d6f2c2045766f6c757469766f0ad981d8aad8ad20d88c20d8add8b120d88c20d985d8b3d8aad982d98420d88c20d8aad8b7d988d8b10a4f6666656e2c20667265692c206175746f6e6f6d2c2045766f6c7574696f6e0a45766f6c75c3a7c3a36f206162657274612c206c69767265206520617574c3b36e6f6d610ac39670706e612c20667269612c206175746f6e6f6d612c2065766f6c7574696f6e0ace91cebdcebfceb9cebacf84ceae2c20ceb5cebbceb5cf8dceb8ceb5cf81ceb72c20ceb1cf85cf84cf8ccebdcebfcebcceb72c20ceb5cebeceadcebbceb9cebeceb70a41c3a7c4b16b2c20c3b67a67c3bc722c20c3b67a65726b2c20657672696d0a4f736361696c2c2073616f7220696e2061697363652c206e65616d6873706c65c3a163682c20c3a96162686cc3b36964", "privateKey": "009cf05b6b3fe8c09b84c13783140c0f1958e8841f8b6f894ef69431522bc65712" -} \ No newline at end of file +} diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseReq.java index f49102fe47..0ce34432eb 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseReq.java @@ -3,7 +3,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-07 15:11 - * @Description: 功能描述 + * @Description: Function Description */ public class BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseRpcService.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseRpcService.java index a0b69100fe..b3fd7ba2b9 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseRpcService.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseRpcService.java @@ -14,19 +14,19 @@ /** * @Author: zhoulijun * @Time: 2019-03-07 19:46 - * @Description: rpc provider 基础类 + * @Description: rpc provider Basic class */ public abstract class BaseRpcService extends BaseService { public static final ErrorCode RPC_ERROR_CODE = ErrorCode.init("10016"); /** - * 调用其他模块rpc接口 - * @param module 模块名称 - * @param method rpc接口名称 - * @param req 业务参数对象 - * @param callback 回调函数 - * @param 返回值泛型类型 + * Call other modulesrpcinterface + * @param module Module Name + * @param method rpcInterface Name + * @param req Business parameter object + * @param callback Callback function + * @param Return value generic type * @return */ protected Result callRpc(String module,String method,Object req,Function callback) { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseService.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseService.java index 889cb62330..ec55833acc 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseService.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/BaseService.java @@ -8,13 +8,13 @@ /** * @Author: zhoulijun * @Time: 2019-03-06 15:44 - * @Description: 功能描述 + * @Description: Function Description */ public abstract class BaseService { /** - * 默认chainId - * 从配置文件中注入 + * defaultchainId + * Inject from configuration file */ private int chainId; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Provider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Provider.java index 322f69a344..ba7e5a3472 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Provider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Provider.java @@ -8,7 +8,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-06 14:36 - * @Description: 功能描述 + * @Description: Function Description */ @Retention(RetentionPolicy.RUNTIME) @Target(value={ElementType.TYPE}) diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Result.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Result.java index d6fe7fb18d..8c68fdecb8 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Result.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/Result.java @@ -7,7 +7,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-06 15:45 - * @Description: 功能描述 + * @Description: Function Description */ public class Result { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceManager.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceManager.java index 3c184dabac..028e3d0e71 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceManager.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceManager.java @@ -12,12 +12,12 @@ /** * @Author: zhoulijun * @Time: 2019-03-06 14:34 - * @Description: 功能描述 + * @Description: Function Description */ public class ServiceManager { /** - * 初始化标记 + * Initialize markers */ public static boolean inited = false; @@ -25,7 +25,7 @@ public class ServiceManager { public static Map serviceImpls = new HashMap<>(); /** - * 获取服务实现类 + * Get Service Implementation Class * @param serviceClass * @param * @return @@ -38,7 +38,7 @@ public static T get(Class serviceClass){ } public static void init(Integer defaultChainId, Provider.ProviderType providerType) { - //1.初始化提供器类型 + //1.Initialize provider type // Provider.ProviderType providerType; // Integer defaultChainId; // try { @@ -51,7 +51,7 @@ public static void init(Integer defaultChainId, Provider.ProviderType providerTy // } catch (IOException e) { // throw new RuntimeException("api provider init fail, load module.properties fail"); // } - //2.加载服务提供类实例 + //2.Load service provider class instances List imps = ScanUtil.scan("io.nuls.base.api.provider"); imps.forEach(cls->{ Provider annotation = (Provider) cls.getAnnotation(Provider.class); diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceProxy.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceProxy.java index c7ea56cb91..bc3d4102f5 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceProxy.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ServiceProxy.java @@ -11,7 +11,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-07 18:33 - * @Description: 在请求参数中注入默认chainId + * @Description: Inject default in request parameterschainId */ public class ServiceProxy implements MethodInterceptor { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountService.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountService.java index 83c0a99dbd..36e1980335 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountService.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountService.java @@ -13,13 +13,13 @@ * @Author: zhoulijun * @Time: 2019-03-06 14:29 * @Description: - * 账户服务 + * Account Services * account service */ public interface AccountService { /** - * 创建账户 + * Create an account * create account * @param req * @return @@ -27,7 +27,7 @@ public interface AccountService { Result createAccount(CreateAccountReq req); /** - * 备份账户到key store + * Backup account tokey store * backup account to key store * @param req * @return @@ -35,7 +35,7 @@ public interface AccountService { Result backupAccount(BackupAccountReq req); /** - * 获取账户keyStore + * Obtain accountkeyStore * get account's keystore * @param req * @return @@ -44,7 +44,7 @@ public interface AccountService { /** - * 通过私钥导入账户 + * Import account through private key * import account by private key * @param req * @return @@ -53,7 +53,7 @@ public interface AccountService { /** - * 通过key store导入账户 + * adoptkey storeImport account * import account by key store * @param req * @return @@ -62,7 +62,7 @@ public interface AccountService { Result importKeyStoreFiles(ImportKeyStoreFilesReq req); /** - * 修改账户密码 + * Change account password * reset account password * @param req * @return @@ -71,7 +71,7 @@ public interface AccountService { /** - * 根据地址获取账户信息 + * Obtain account information based on address * get account info by address * @param req * @return @@ -79,14 +79,14 @@ public interface AccountService { Result getAccountByAddress(GetAccountByAddressReq req); /** - * 获取多签账户信息 + * Obtain multi signature account information * @param req * @return */ Result getMultiSignAccount(GetMultiSignAccountByAddressReq req); /** - * 获取账户列表 + * Get account list * get all account list * @return */ @@ -94,7 +94,7 @@ public interface AccountService { /** - * 删除指定账户 + * Delete specified account * remove account by address * @param req * @return @@ -102,7 +102,7 @@ public interface AccountService { Result removeAccount(RemoveAccountReq req); /** - * 查询账户私钥 + * Query account private key * get account private key * @param req * @return @@ -111,7 +111,7 @@ public interface AccountService { /** - * 设置账户别名 + * Set account alias * set account alias * @param req * @return @@ -119,28 +119,28 @@ public interface AccountService { Result setAccountAlias(SetAccountAliasReq req); /** - * 创建多签账户 + * Create a multi signature account * @param req * @return */ Result createMultiSignAccount(GenerateMultiSignAccountReq req); /** - * 移除一个多签账户 + * Remove a multi signature account * @param req * @return */ Result removeMultiSignAccount(RemoveMultiSignAccountReq req); /** - * 多签账户设置别名 + * Setting aliases for multiple signed accounts * @param req * @return */ Result setMultiSignAccountAlias(SetMultiSignAccountAliasReq req); /** - * 根据文件地址获取AccountKeystoreDto对象 + * Obtain based on file addressAccountKeystoreDtoobject * Gets the AccountKeystoreDto object based on the file address * @param path * @return @@ -150,7 +150,7 @@ default String getAccountKeystoreDto(String path) { try { file = new File(URLDecoder.decode(path, "UTF-8")); } catch (UnsupportedEncodingException e) { - Log.error("未找到文件", e); + Log.error("no files found", e); } if (null != file && file.isFile()) { StringBuilder ks = new StringBuilder(); diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountServiceForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountServiceForRpc.java index 6d2cb50564..3ee4c25ea7 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountServiceForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/AccountServiceForRpc.java @@ -22,7 +22,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-06 14:41 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class AccountServiceForRpc extends BaseRpcService implements AccountService { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/AccountInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/AccountInfo.java index a95e198316..fec2c1d568 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/AccountInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/AccountInfo.java @@ -8,23 +8,23 @@ public class AccountInfo { /** - * 账户地址 + * Account address */ private String address; /** - * 别名 + * alias */ private String alias; /** - * 公钥Hex.encode(byte[]) + * Public keyHex.encode(byte[]) */ private String pubkeyHex; /** - * 已加密私钥Hex.encode(byte[]) + * Encrypted private keyHex.encode(byte[]) */ private String encryptedPrikeyHex; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/BackupAccountReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/BackupAccountReq.java index 416155b301..4dc6accbd6 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/BackupAccountReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/BackupAccountReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-07 17:50 - * @Description: 功能描述 + * @Description: Function Description */ public class BackupAccountReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/CreateAccountReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/CreateAccountReq.java index 335916f86f..cb3398b054 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/CreateAccountReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/CreateAccountReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-06 15:36 - * @Description: 功能描述 + * @Description: Function Description */ public class CreateAccountReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GenerateMultiSignAccountReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GenerateMultiSignAccountReq.java index c4c0440be1..de0f1b4a9c 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GenerateMultiSignAccountReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GenerateMultiSignAccountReq.java @@ -7,17 +7,17 @@ /** * @Author: zhoulijun * @Time: 2019-07-18 14:07 - * @Description: 创建多签账户 + * @Description: Create a multi signature account */ public class GenerateMultiSignAccountReq extends BaseReq { /** - * 公钥集合(任意普通地址的公钥或存在于当前节点中的普通账户地址) + * Public key set(Public key of any ordinary address or ordinary account address existing in the current node) */ private List pubKeys; /** - * 最小签名数 + * Minimum number of signatures */ private int minSigns; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountByAddressReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountByAddressReq.java index 5c204a8ccb..5eaf6ac602 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountByAddressReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountByAddressReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-08 13:42 * @Description: - * 根据地址获取账户信息 + * Obtain account information based on address * get account info by address */ public class GetAccountByAddressReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountPrivateKeyByAddressReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountPrivateKeyByAddressReq.java index 4fde1ea5fe..3a6df3f662 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountPrivateKeyByAddressReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetAccountPrivateKeyByAddressReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-07 17:50 * @Description: - * 查询账户私钥 + * Query account private key * get account private key */ public class GetAccountPrivateKeyByAddressReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetMultiSignAccountByAddressReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetMultiSignAccountByAddressReq.java index 832a059536..eb0d4b82db 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetMultiSignAccountByAddressReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/GetMultiSignAccountByAddressReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-08 13:42 * @Description: - * 根据地址获取多签账户信息 + * Obtain multi signature account information based on address * get account info by address */ public class GetMultiSignAccountByAddressReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByKeyStoreReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByKeyStoreReq.java index 0f3d8a5f6e..5dcfa25647 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByKeyStoreReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByKeyStoreReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-07 20:44 * @Description: - * 通过key store导入账户 + * adoptkey storeImport account * import account by key store */ public class ImportAccountByKeyStoreReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByPrivateKeyReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByPrivateKeyReq.java index 7a8c1d6e01..4278ad1010 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByPrivateKeyReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportAccountByPrivateKeyReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-07 20:32 * @Description: - * 通过私钥导入账户 + * Import account through private key * import account by private key */ public class ImportAccountByPrivateKeyReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportKeyStoreFilesReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportKeyStoreFilesReq.java index ff7b3b77bf..542d728707 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportKeyStoreFilesReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/ImportKeyStoreFilesReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-07 20:44 * @Description: - * 通过key store导入账户 + * adoptkey storeImport account * import account by key store */ public class ImportKeyStoreFilesReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/KeyStoreReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/KeyStoreReq.java index f365e0c49a..df14d8e97f 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/KeyStoreReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/KeyStoreReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-07 17:50 - * @Description: 功能描述 + * @Description: Function Description */ public class KeyStoreReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/MultiSignAccountInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/MultiSignAccountInfo.java index 0faf3cd63d..e881e06b8a 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/MultiSignAccountInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/MultiSignAccountInfo.java @@ -8,7 +8,7 @@ /** * @Author: zhoulijun * @Time: 2019-07-23 17:05 - * @Description: 功能描述 + * @Description: Function Description */ public class MultiSignAccountInfo { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveAccountReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveAccountReq.java index fef9a68abf..09a4dc59d0 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveAccountReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveAccountReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-07 17:50 * @Description: - * 删除指定账户 + * Delete specified account * remove account by address */ public class RemoveAccountReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveMultiSignAccountReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveMultiSignAccountReq.java index 9bfe44c3e0..8bbfac637b 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveMultiSignAccountReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/RemoveMultiSignAccountReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-07-19 16:18 - * @Description: 删除多签账户 + * @Description: Delete multiple signed accounts */ public class RemoveMultiSignAccountReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetAccountAliasReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetAccountAliasReq.java index cb1949094f..999bfddf45 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetAccountAliasReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetAccountAliasReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-08 14:39 * @Description: - * 设置账户别名 + * Set account alias * set account alias */ public class SetAccountAliasReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetMultiSignAccountAliasReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetMultiSignAccountAliasReq.java index 215ac7a8ab..dd994f0c93 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetMultiSignAccountAliasReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/SetMultiSignAccountAliasReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-07-25 14:12 - * @Description: 功能描述 + * @Description: Function Description */ public class SetMultiSignAccountAliasReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/UpdatePasswordReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/UpdatePasswordReq.java index 56119c267d..b7e88596aa 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/UpdatePasswordReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/account/facade/UpdatePasswordReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-08 11:57 * @Description: - * 修改密码 + * Change password * reset account password */ public class UpdatePasswordReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java index 6aa0829c43..9c58c826c3 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java @@ -28,7 +28,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-11 09:37 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class BlockServiceForRpc extends BaseRpcService implements BlockService { @@ -99,7 +99,7 @@ private Result tranderBlockHeader(Map result) { res.setTxHashList(hashList); return success(res); } catch (NulsException e) { - Log.error("反序列化block header发生异常", e); + Log.error("Deserializationblock headerexception occurred", e); return fail(CommonCodeConstanst.DESERIALIZE_ERROR); } } diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/BlockHeaderData.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/BlockHeaderData.java index 3fbbe953cd..1b7479b957 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/BlockHeaderData.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/BlockHeaderData.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-19 18:07 - * @Description: 功能描述 + * @Description: Function Description */ public class BlockHeaderData { @@ -40,12 +40,12 @@ public class BlockHeaderData { protected int packingIndexOfRound; /** - * 主网当前生效的版本 + * The current effective version of the main network */ private short mainVersion; /** - * 区块的版本，可以理解为本地钱包的版本 + * The version of the block can be understood as the version of the local wallet */ private short blockVersion; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHashReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHashReq.java index 4d12fc9550..9bf350e7c7 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHashReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHashReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 09:33 * @Description: - * 通过hash获取区块头 + * adopthashGet block header * get block header by hash */ public class GetBlockHeaderByHashReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHeightReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHeightReq.java index 21d25de448..20ab3dd775 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHeightReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByHeightReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 09:33 * @Description: - * 通过区块高度获取区块头 + * Obtain block headers through block height * get block header by height */ public class GetBlockHeaderByHeightReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByLastHeightReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByLastHeightReq.java index 508a64dce3..39771400d5 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByLastHeightReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/facade/GetBlockHeaderByLastHeightReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 09:33 * @Description: - * 获取最新高度区块头 + * Get the latest height block header * get block header by last height */ public class GetBlockHeaderByLastHeightReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java index 8032feafbc..bd341a6fe9 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProvider.java @@ -43,7 +43,7 @@ public interface ConsensusProvider { /** - * 委托共识 + * Commission consensus * @param req * @return */ @@ -51,7 +51,7 @@ public interface ConsensusProvider { /** - * 委托共识 + * Commission consensus * @param req * @return */ @@ -59,7 +59,7 @@ public interface ConsensusProvider { /** - * 退出委托 + * Exit the commission * @param req * @return */ @@ -67,7 +67,7 @@ public interface ConsensusProvider { /** - * 退出委托 + * Exit the commission * @param req * @return */ @@ -75,7 +75,7 @@ public interface ConsensusProvider { /** - * 查询节点信息 + * Query node information * @param req * @return */ @@ -83,14 +83,14 @@ public interface ConsensusProvider { /** - * 查询节点列表 + * Query node list * @param req * @return */ Result getAgentList(GetAgentListReq req); /** - * 查询委托列表 + * Query delegation list * @param req * @return */ diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java index 4bce6dcdbb..98eb5bb7b7 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/ConsensusProviderForRpc.java @@ -17,7 +17,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-11 11:59 - * @Description: 共识 + * @Description: Consensus */ @Provider(Provider.ProviderType.RPC) public class ConsensusProviderForRpc extends BaseRpcService implements ConsensusProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/AgentInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/AgentInfo.java index a505993ed6..687b7bdaea 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/AgentInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/AgentInfo.java @@ -3,7 +3,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-26 15:44 - * @Description: 功能描述 + * @Description: Function Description */ public class AgentInfo { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateAgentReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateAgentReq.java index 7f0fbd48b9..bd7096fa51 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateAgentReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateAgentReq.java @@ -8,7 +8,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:44 * @Description: - * 创建共识节点 + * Create consensus nodes * create consensus agent node */ public class CreateAgentReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateMultiSignAgentReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateMultiSignAgentReq.java index 7688b9fce1..99360f935d 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateMultiSignAgentReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/CreateMultiSignAgentReq.java @@ -8,7 +8,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:44 * @Description: - * 创建共识节点 + * Create consensus nodes * create consensus agent node */ public class CreateMultiSignAgentReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/DepositToAgentReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/DepositToAgentReq.java index d81148de80..93a3c4295d 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/DepositToAgentReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/DepositToAgentReq.java @@ -8,7 +8,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:53 * @Description: - * 委托共识 + * Commission consensus */ public class DepositToAgentReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentInfoReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentInfoReq.java index e3187bb125..fa39bf357b 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentInfoReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentInfoReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-26 15:46 - * @Description: 功能描述 + * @Description: Function Description */ public class GetAgentInfoReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentListReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentListReq.java index b2f8b1a7be..eb0143f5a5 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentListReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetAgentListReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-26 15:54 - * @Description: 功能描述 + * @Description: Function Description */ public class GetAgentListReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetDepositListReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetDepositListReq.java index 362d3cd4c2..6d0d8e6381 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetDepositListReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetDepositListReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-26 15:54 - * @Description: 功能描述 + * @Description: Function Description */ public class GetDepositListReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java index 9bfa9173da..7b83a3fbd5 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/GetStopAgentCoinDataReq.java @@ -6,13 +6,13 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:51 * @Description: - * 停止共识 + * Stop consensus * stop consensus */ public class GetStopAgentCoinDataReq extends BaseReq { /** - * 共识地址 + * Consensus Address */ String agentHash; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountDepositToAgentReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountDepositToAgentReq.java index 0346994ab2..37782ed8fb 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountDepositToAgentReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountDepositToAgentReq.java @@ -8,7 +8,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:53 * @Description: - * 委托共识 + * Commission consensus */ public class MultiSignAccountDepositToAgentReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountWithdrawReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountWithdrawReq.java index c48249b0d1..e9b53918f8 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountWithdrawReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/MultiSignAccountWithdrawReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:57 * @Description: - * 退出共识 + * Exit consensus */ public class MultiSignAccountWithdrawReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopAgentReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopAgentReq.java index 625331417e..1ad310c098 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopAgentReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopAgentReq.java @@ -6,13 +6,13 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:51 * @Description: - * 停止共识 + * Stop consensus * stop consensus */ public class StopAgentReq extends BaseReq { /** - * 共识地址 + * Consensus Address */ String address; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopMultiSignAgentReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopMultiSignAgentReq.java index cfc01d1799..5574ed95c4 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopMultiSignAgentReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/StopMultiSignAgentReq.java @@ -6,13 +6,13 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:51 * @Description: - * 停止共识 + * Stop consensus * stop consensus */ public class StopMultiSignAgentReq extends BaseReq { /** - * 共识地址 + * Consensus Address */ String address; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/WithdrawReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/WithdrawReq.java index 07ca634097..e39af60403 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/WithdrawReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/consensus/facade/WithdrawReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-11 11:57 * @Description: - * 退出共识 + * Exit consensus */ public class WithdrawReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProvider.java index dec1df8d99..2607380cfb 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProvider.java @@ -8,7 +8,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 14:35 - * @Description: 功能描述 + * @Description: Function Description */ public interface ContractProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProviderForRpc.java index f9fa7bbe8e..4a3b58f423 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/ContractProviderForRpc.java @@ -16,7 +16,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 14:36 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class ContractProviderForRpc extends BaseRpcService implements ContractProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/AccountContractInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/AccountContractInfo.java index 5782e99b10..d66c6e2827 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/AccountContractInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/AccountContractInfo.java @@ -3,7 +3,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:57 - * @Description: 功能描述 + * @Description: Function Description */ public class AccountContractInfo { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CallContractReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CallContractReq.java index 885014e222..6d98dce1e2 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CallContractReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CallContractReq.java @@ -3,7 +3,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 15:27 - * @Description: 功能描述 + * @Description: Function Description */ public class CallContractReq extends Contract { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/Contract.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/Contract.java index 4ace404371..178460f558 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/Contract.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/Contract.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 15:28 - * @Description: 功能描述 + * @Description: Function Description */ public class Contract extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CreateContractReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CreateContractReq.java index dacd9ac8b3..1130914911 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CreateContractReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/CreateContractReq.java @@ -4,7 +4,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 14:33 - * @Description: 功能描述 + * @Description: Function Description */ public class CreateContractReq extends Contract { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/DeleteContractReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/DeleteContractReq.java index b344dad4cf..1866d1a0a1 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/DeleteContractReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/DeleteContractReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 15:52 - * @Description: 功能描述 + * @Description: Function Description */ public class DeleteContractReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetAccountContractListReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetAccountContractListReq.java index b34d4184b3..ba490ecde2 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetAccountContractListReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetAccountContractListReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:55 - * @Description: 功能描述 + * @Description: Function Description */ public class GetAccountContractListReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractConstructorArgsReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractConstructorArgsReq.java index 459a9c3d73..d5660ccf01 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractConstructorArgsReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractConstructorArgsReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 15:04 - * @Description: 功能描述 + * @Description: Function Description */ public class GetContractConstructorArgsReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractInfoReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractInfoReq.java index 859decde9a..2171e10dc0 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractInfoReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractInfoReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:17 - * @Description: 功能描述 + * @Description: Function Description */ public class GetContractInfoReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractResultReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractResultReq.java index 7a33808d15..a9752a8e29 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractResultReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractResultReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:13 - * @Description: 功能描述 + * @Description: Function Description */ public class GetContractResultReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractTxReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractTxReq.java index 0cc17a16bf..bb1b6ee453 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractTxReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/GetContractTxReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:07 - * @Description: 功能描述 + * @Description: Function Description */ public class GetContractTxReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TokenTransferReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TokenTransferReq.java index 76754b7115..5b61841c24 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TokenTransferReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TokenTransferReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:39 - * @Description: 功能描述 + * @Description: Function Description */ public class TokenTransferReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TransferToContractReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TransferToContractReq.java index 85243cbcea..d68714665f 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TransferToContractReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/TransferToContractReq.java @@ -7,7 +7,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 16:26 - * @Description: 功能描述 + * @Description: Function Description */ public class TransferToContractReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/ViewContractReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/ViewContractReq.java index 52732a95c5..c199e125ac 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/ViewContractReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/contract/facade/ViewContractReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-23 15:45 - * @Description: 功能描述 + * @Description: Function Description */ public class ViewContractReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProvider.java index df2de7d2ac..60ad52cf99 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProvider.java @@ -8,13 +8,13 @@ /** * @Author: zhoulijun * @Time: 2019-05-07 16:07 - * @Description: 功能描述 + * @Description: Function Description */ public interface ChainManageProvider { /** - * 在主网注册一条友链，使其可以实现跨链交易 + * Register a friend chain on the main network to enable cross chain transactions * * @param req * @return @@ -28,7 +28,7 @@ public interface ChainManageProvider { Result updateChain(RegisterChainReq req); /** - * 注销资产 + * Cancellation of assets * * @param req * @return @@ -36,7 +36,7 @@ public interface ChainManageProvider { Result disableCrossAsset(DisableAssetReq req); /** - * 增加链资产 + * Increase chain assets * * @param req * @return @@ -45,7 +45,7 @@ public interface ChainManageProvider { Result addCrossLocalAsset(AddCrossLocalAssetReq req); /** - * 获取注册了跨链交易的链的注册信息 + * Obtain registration information for chains registered for cross chain transactions * * @param req * @return diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProviderForRpc.java index e305235660..11c95eaf51 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/ChainManageProviderForRpc.java @@ -13,7 +13,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-07 16:08 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class ChainManageProviderForRpc extends BaseRpcService implements ChainManageProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java index fc1c16128e..6971b56e8a 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProvider.java @@ -7,12 +7,12 @@ /** * @Author: zhoulijun * @Time: 2019-05-06 17:01 - * @Description: 功能描述 + * @Description: Function Description */ public interface CrossChainProvider { /** - * 创建一笔跨链交易 + * Create a cross chain transaction * @param req * @return */ @@ -20,7 +20,7 @@ public interface CrossChainProvider { /** - * 查询跨链交易在其他链的处理状态 + * Query the processing status of cross chain transactions in other chains * @param req * @return */ @@ -28,21 +28,21 @@ public interface CrossChainProvider { /** - * 查询跨链交易在其他链的处理状态 + * Query the processing status of cross chain transactions in other chains * @param req * @return */ Result getCrossTx(GetCrossTxStateReq req); /** - * 给全网发信号，对指定跨链交易重新进行拜赞庭验证 + * Send a signal to the entire network to re validate the designated cross chain transactions through the Byzantine Court * @param req * @return */ Result rehandleCtx(RehandleCtxReq req); /** - * 创建一个通知所有节点重置本地验证人列表的交易 + * Create a transaction that notifies all nodes to reset the local validator list * @param req * @return */ diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java index ec19b70036..33b10b3eca 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/CrossChainProviderForRpc.java @@ -21,7 +21,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-06 17:14 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class CrossChainProviderForRpc extends BaseRpcService implements CrossChainProvider { @@ -78,7 +78,7 @@ private Result tranderTransaction(String hexString){ transaction.parse(new NulsByteBuffer(RPCUtil.decode(hexString))); return success(transaction); } catch (NulsException e) { - Log.error("反序列化transaction发生异常",e); + Log.error("Deserializationtransactionexception occurred",e); return fail(CommonCodeConstanst.DESERIALIZE_ERROR); } } diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossAssetReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossAssetReq.java index b9a0ef21a1..bf648c878e 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossAssetReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossAssetReq.java @@ -29,7 +29,7 @@ /** * @Author: ljs * @Time: 2019-08-06 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class AddCrossAssetReq extends BaseReq { private int assetId; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossLocalAssetReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossLocalAssetReq.java index 1e88c6c2ba..d72ea2b09f 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossLocalAssetReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/AddCrossLocalAssetReq.java @@ -29,7 +29,7 @@ /** * @Author: ljs * @Time: 2019-10-24 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class AddCrossLocalAssetReq extends BaseReq { private int assetId; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateCrossTxReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateCrossTxReq.java index 57fd2df8ab..075a757d42 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateCrossTxReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateCrossTxReq.java @@ -9,12 +9,12 @@ /** * @Author: zhoulijun * @Time: 2019-05-06 16:56 - * @Description: 功能描述 + * @Description: Function Description */ public class CreateCrossTxReq extends BaseReq { /** - * remark : 跨链转账交易 + * remark : Cross chain transfer transactions */ private String remark; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateResetLocalVerifierTxReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateResetLocalVerifierTxReq.java index 525cebfb13..10827b189b 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateResetLocalVerifierTxReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CreateResetLocalVerifierTxReq.java @@ -9,7 +9,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-06 16:56 - * @Description: 功能描述 + * @Description: Function Description */ public class CreateResetLocalVerifierTxReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossAssetRegisterInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossAssetRegisterInfo.java index 71a22316a9..0dbc3bad77 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossAssetRegisterInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossAssetRegisterInfo.java @@ -6,7 +6,7 @@ /** * @Author: ljs * @Time: 2019-08-07 11:41 - * @Description: 功能描述 + * @Description: Function Description */ public class CrossAssetRegisterInfo { private int chainId; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossChainRegisterInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossChainRegisterInfo.java index 4c233a4d0f..2af6cf7ae1 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossChainRegisterInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/CrossChainRegisterInfo.java @@ -5,22 +5,22 @@ /** * @Author: zhoulijun * @Time: 2019-05-07 11:41 - * @Description: 功能描述 + * @Description: Function Description */ public class CrossChainRegisterInfo { /** - * chainId : 链标识 - * chainName : 链名称 - * addressType : 链上创建的账户的地址类型：1生态内 2非生态内 - * magicNumber : 网络魔法参数 - * minAvailableNodeNum : 最小可用节点数量 - * txConfirmedBlockNum : 跨链交易确认块数 + * chainId : Chain identification + * chainName : Chain Name + * addressType : The address type of the account created on the chain：1Within the ecosystem 2Non ecological interior + * magicNumber : Network Magic Parameters + * minAvailableNodeNum : Minimum number of available nodes + * txConfirmedBlockNum : Number of cross chain transaction confirmation blocks * regAddress : NsdxSexqXF4eVXkcGLPpZCPKo92A8xpp * regTxHash : FFFFF - * selfAssetKeyList : 链下注册的资产列表，由chainId_assetId 组合的资产key值 - * totalAssetKeyList : 链下流通的资产列表，由chainId_assetId 组合的资产key值 - * createTime : 创建时间 + * selfAssetKeyList : List of assets registered off the chain, bychainId_assetId Portfolio assetskeyvalue + * totalAssetKeyList : The list of assets circulating off the chain, consisting ofchainId_assetId Portfolio assetskeyvalue + * createTime : Creation time * seeds : xxx.xxx.xxx.xxx:8001,xxx.xxx.xxx.xxx:8002 */ @@ -35,11 +35,11 @@ public class CrossChainRegisterInfo { private long createTime; List verifierList; /** - * 按100来计算拜占庭比例 + * according to100To calculate the Byzantine proportion */ int signatureByzantineRatio = 0; /** - * 最大签名数量 + * Maximum number of signatures */ int maxSignatureCount = 0; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/DisableAssetReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/DisableAssetReq.java index 599ffd4bbb..09af54151c 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/DisableAssetReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/DisableAssetReq.java @@ -29,7 +29,7 @@ /** * @Author: ljs * @Time: 2019-08-06 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class DisableAssetReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossAssetInfoReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossAssetInfoReq.java index ac3b8730d4..f928801412 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossAssetInfoReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossAssetInfoReq.java @@ -5,7 +5,7 @@ /** * @Author: ljs * @Time: 2019-08-07 11:49 - * @Description: 功能描述 + * @Description: Function Description */ public class GetCrossAssetInfoReq extends BaseReq { private int assetId; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossChainInfoReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossChainInfoReq.java index d71ce73bc9..16b9c9ba43 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossChainInfoReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossChainInfoReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-07 11:49 - * @Description: 功能描述 + * @Description: Function Description */ public class GetCrossChainInfoReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossTxStateReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossTxStateReq.java index 8b27e6ebfe..32c116516d 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossTxStateReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/GetCrossTxStateReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-07 13:35 - * @Description: 功能描述 + * @Description: Function Description */ public class GetCrossTxStateReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RegisterChainReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RegisterChainReq.java index ef3d5975bb..804b269820 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RegisterChainReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RegisterChainReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-06 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class RegisterChainReq extends BaseReq { @@ -20,7 +20,7 @@ public class RegisterChainReq extends BaseReq { * txConfirmedBlockNum : 30 * address : NsdxSexqXF4eVXkcGLPpZCPKo92A8xpp * symbol : NULS - * assetName : 纳斯 + * assetName : Nass * initNumber : 1000000000 * decimalPlaces : 8 * password : xxxxxxxxxxxxx @@ -33,15 +33,15 @@ public class RegisterChainReq extends BaseReq { private Long magicNumber; /** - * 初始化验证人信息 + * Initialize Verifier Information */ private String verifierList = ""; /** - * 按100来计算拜占庭比例 + * according to100To calculate the Byzantine proportion */ private int signatureByzantineRatio = 0; /** - * 最大签名数量 + * Maximum number of signatures */ private int maxSignatureCount = 0; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RehandleCtxReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RehandleCtxReq.java index c52064a625..046e5f5aae 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RehandleCtxReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/crosschain/facade/RehandleCtxReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2020/9/11 15:09 - * @Description: 重新对跨链交易进行拜赞庭验证 + * @Description: Re validate cross chain transactions through Byzantine verification */ public class RehandleCtxReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProvider.java index 2178c0e319..fa491df4eb 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProvider.java @@ -8,12 +8,12 @@ /** * @Author: zhoulijun * @Time: 2019-03-11 13:42 - * @Description: 功能描述 + * @Description: Function Description */ public interface LedgerProvider { /** - * 获取账户余额 + * Obtain account balance * * @param req * @return @@ -26,7 +26,7 @@ public interface LedgerProvider { Result getContractAsset(ContractAsset req); /** - * 本地资产注册 + * Local asset registration * * @param req * @return diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProviderForRpc.java index d4bd894d44..fe57d75c93 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/LedgerProviderForRpc.java @@ -13,7 +13,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-11 13:44 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class LedgerProviderForRpc extends BaseRpcService implements LedgerProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/AccountBalanceInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/AccountBalanceInfo.java index df712727c8..45446f134c 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/AccountBalanceInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/AccountBalanceInfo.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-08 15:39 - * @Description: 功能描述 + * @Description: Function Description */ public class AccountBalanceInfo { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/ContractAsset.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/ContractAsset.java index de9a698420..cacf9902d3 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/ContractAsset.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/ContractAsset.java @@ -29,7 +29,7 @@ /** * @Author: ljs * @Time: 2019-08-06 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class ContractAsset extends BaseReq { private String contractAddress; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetAssetReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetAssetReq.java index aeefd38136..0cf1493e3a 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetAssetReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetAssetReq.java @@ -29,7 +29,7 @@ /** * @Author: ljs * @Time: 2019-08-06 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class GetAssetReq extends BaseReq { private String txHash; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetBalanceReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetBalanceReq.java index 6920891e4b..0db40dbbd1 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetBalanceReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/GetBalanceReq.java @@ -6,7 +6,7 @@ * @Author: zhoulijun * @Time: 2019-03-08 15:36 * @Description: - * 获取指定账户余额 + * Obtain the specified account balance * get account balance */ diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/RegLocalAssetReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/RegLocalAssetReq.java index 0c93f3f252..8eee1c06d7 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/RegLocalAssetReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/ledger/facade/RegLocalAssetReq.java @@ -29,7 +29,7 @@ /** * @Author: ljs * @Time: 2019-08-06 16:50 - * @Description: 功能描述 + * @Description: Function Description */ public class RegLocalAssetReq extends BaseReq { private String assetSymbol; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProvider.java index 518b934bf4..231a121d30 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProvider.java @@ -7,7 +7,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-12 16:11 - * @Description: 功能描述 + * @Description: Function Description */ public interface NetworkProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProviderForRpc.java index 4fe7c38004..51cf067314 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/NetworkProviderForRpc.java @@ -17,7 +17,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-12 16:16 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class NetworkProviderForRpc extends BaseRpcService implements NetworkProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/NetworkInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/NetworkInfo.java index 39f8c7b870..bd2e907cd8 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/NetworkInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/NetworkInfo.java @@ -4,31 +4,31 @@ * @Author: zhoulijun * @Time: 2019-03-12 16:13 * @Description: - * 网络信息 + * network information * network info */ public class NetworkInfo { /** - * 本地最新区块高度 + * Local latest block height */ long localBestHeight; /** - * 网络最新区块高度 + * The latest block height in the network */ long netBestHeight; /** - * 网络时间偏移值 毫秒数 + * Network time offset value Msec */ long timeOffset; /** - * 被动连接节点数量 + * Number of passive connection nodes */ int inCount; /** - * 主动连接节点数量 + * Number of active connection nodes */ int outCount; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/RemoteNodeInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/RemoteNodeInfo.java index c7f4871d35..e307b4b0cf 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/RemoteNodeInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/network/facade/RemoteNodeInfo.java @@ -3,7 +3,7 @@ /** * @Author: zhoulijun * @Time: 2019-05-28 14:45 - * @Description: 功能描述 + * @Description: Function Description */ public class RemoteNodeInfo { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProvider.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProvider.java index 8dfb21e8cb..b965533d29 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProvider.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProvider.java @@ -9,7 +9,7 @@ /** * @Author: zhoulijun * @Time: 2020-01-15 18:16 - * @Description: 功能描述 + * @Description: Function Description */ public interface ProtocolProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProviderForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProviderForRpc.java index 6005216d8b..bd99cfd5e9 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProviderForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/ProtocolProviderForRpc.java @@ -13,7 +13,7 @@ /** * @Author: zhoulijun * @Time: 2020-01-15 18:17 - * @Description: 功能描述 + * @Description: Function Description */ @Provider(Provider.ProviderType.RPC) public class ProtocolProviderForRpc extends BaseRpcService implements ProtocolProvider { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/GetVersionReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/GetVersionReq.java index 89a74d9f18..81108e69d6 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/GetVersionReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/GetVersionReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2020-01-16 11:48 - * @Description: 功能描述 + * @Description: Function Description */ public class GetVersionReq extends BaseReq { } diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/VersionInfo.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/VersionInfo.java index a4076dcf61..ff0d8ed208 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/VersionInfo.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/protocol/facade/VersionInfo.java @@ -4,7 +4,7 @@ /** * @Author: zhoulijun * @Time: 2020-01-15 18:16 - * @Description: 功能描述 + * @Description: Function Description */ public class VersionInfo { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferService.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferService.java index fd4be63ea5..265822f9f2 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferService.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferService.java @@ -7,18 +7,18 @@ /** * @Author: zhoulijun * @Time: 2019-03-08 16:18 - * @Description: 功能描述 + * @Description: Function Description */ public interface TransferService { //todo /** - * 测试批量发交易 要删 + * Test batch trading To delete */ Result transferTest(int method, String addr1, String addr2,String amount); /** - * 发起交易 + * Initiate transaction * transfer * @param req * @return @@ -26,14 +26,14 @@ public interface TransferService { Result transfer(TransferReq req); /** - * 创建多签交易 + * Create multi signature transactions * @param req * @return */ Result multiSignTransfer(CreateMultiSignTransferReq req); /** - * 签名多签交易 + * Multiple signature transactions * @param req * @return */ @@ -41,7 +41,7 @@ public interface TransferService { /** - * 通过别名转账 + * Transfer through alias * transfer by account alias * @param req * @return @@ -49,7 +49,7 @@ public interface TransferService { Result transferByAlias(TransferReq req); /** - * 通过hash获取交易信息 包含未确认的交易 + * adopthashObtain transaction information Including unconfirmed transactions * get transaction by hash * contains unconfirmed transaction * @param req @@ -58,7 +58,7 @@ public interface TransferService { Result getTxByHash(GetTxByHashReq req); /** - * 通过hash获取已确认交易信息 + * adopthashObtain confirmed transaction information * get confirmed transaction by hash * @param req * @return @@ -66,7 +66,7 @@ public interface TransferService { Result getConfirmedTxByHash(GetConfirmedTxByHashReq req); /** - * 通过hash获取已确认的交易的简要数据 + * adopthashObtain brief data on confirmed transactions * @param req * @return */ diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferServiceForRpc.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferServiceForRpc.java index 1e4a60db3f..78821080c7 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferServiceForRpc.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/TransferServiceForRpc.java @@ -35,7 +35,7 @@ * @Author: zhoulijun * @Time: 2019-03-08 17:00 * @Description: - * 交易服务 + * Transaction Services */ @Provider(Provider.ProviderType.RPC) public class TransferServiceForRpc extends BaseRpcService implements TransferService { @@ -125,7 +125,7 @@ private Result tranderTransaction(Map data){ transaction.setStatus(state == TxStatusEnum.UNCONFIRM.getStatus() ? TxStatusEnum.UNCONFIRM : TxStatusEnum.CONFIRMED); return success(transaction); } catch (NulsException e) { - Log.error("反序列化transaction发生异常",e); + Log.error("Deserializationtransactionexception occurred",e); return fail(CommonCodeConstanst.DESERIALIZE_ERROR); } } @@ -152,7 +152,7 @@ private Result tranderTransactionData(Result data res.setTo(transaction.getCoinDataInstance().getTo().stream().map(this::buildTransactionCoinData).collect(Collectors.toList())); return success(res); } catch (NulsException e) { - Log.error("反序列化transaction发生异常",e); + Log.error("Deserializationtransactionexception occurred",e); return fail(CommonCodeConstanst.DESERIALIZE_ERROR); } } diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/CreateMultiSignTransferReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/CreateMultiSignTransferReq.java index a60a63e708..621804bcbc 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/CreateMultiSignTransferReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/CreateMultiSignTransferReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-07-18 14:26 - * @Description: 创建多签交易 + * @Description: Create multi signature transactions */ public class CreateMultiSignTransferReq extends TransferReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetConfirmedTxByHashReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetConfirmedTxByHashReq.java index 41faba7fc4..6cfc032d41 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetConfirmedTxByHashReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetConfirmedTxByHashReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-11 10:47 - * @Description: 功能描述 + * @Description: Function Description */ public class GetConfirmedTxByHashReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetTxByHashReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetTxByHashReq.java index d8e9067193..c1b7550912 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetTxByHashReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/GetTxByHashReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-11 11:01 - * @Description: 功能描述 + * @Description: Function Description */ public class GetTxByHashReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/MultiSignTransferRes.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/MultiSignTransferRes.java index 281ea38054..7a94fa09a1 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/MultiSignTransferRes.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/MultiSignTransferRes.java @@ -3,7 +3,7 @@ /** * @Author: zhoulijun * @Time: 2019-07-18 15:18 - * @Description: 创建多签交易返回对象 + * @Description: Create multiple transaction return objects */ public class MultiSignTransferRes { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/SignMultiSignTransferReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/SignMultiSignTransferReq.java index 4150a32859..cc028ebe31 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/SignMultiSignTransferReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/SignMultiSignTransferReq.java @@ -5,7 +5,7 @@ /** * @Author: zhoulijun * @Time: 2019-07-18 15:24 - * @Description: 多签交易签名 + * @Description: Multiple transaction signatures */ public class SignMultiSignTransferReq extends BaseReq { diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionCoinData.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionCoinData.java index 3dcb799c4c..135c90e109 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionCoinData.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionCoinData.java @@ -5,27 +5,27 @@ /** * @Author: zhoulijun * @Time: 2019-03-21 16:40 - * @Description: 功能描述 + * @Description: Function Description */ public class TransactionCoinData { /** - * byte[24] 账户地址 + * byte[24] Account address */ protected String address; /** - * uint16 资产发行链的id + * uint16 Asset issuance chainid */ protected int assetsChainId; /** - * uint16 资产id + * uint16 assetid */ protected int assetsId; /** - * uint128 数量 + * uint128 quantity */ protected BigInteger amount; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionData.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionData.java index 89a1c4a9cb..652319a593 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionData.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransactionData.java @@ -7,7 +7,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-21 16:39 - * @Description: 功能描述 + * @Description: Function Description */ public class TransactionData { @@ -28,7 +28,7 @@ public class TransactionData { private int size; /** - * 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 + * Order in blocks, stored inrocksDBThe middle is unordered, assigned values when saving blocks, sorted based on this value after retrieval */ private int inBlockIndex; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferByAliasReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferByAliasReq.java index db44eec448..aa6fffe0fd 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferByAliasReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferByAliasReq.java @@ -8,34 +8,34 @@ * @Author: zhoulijun * @Time: 2019-03-11 09:25 * @Description: - * 通过别名转账 + * Transfer through alias * transfer by account alias */ public class TransferByAliasReq extends BaseReq { /** - * 发出资产账户别名 + * Send asset account alias */ private String alias; /** - * 接收地址 + * Receiving address */ private String address; /** - * 转账金额 + * Transfer amount */ private BigInteger amount; /** - * 账户密码 + * Account password * */ private String password; /** - * 备注 + * Remarks */ private String remark; diff --git a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferReq.java b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferReq.java index 932692021a..234e859a57 100644 --- a/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferReq.java +++ b/common/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/transaction/facade/TransferReq.java @@ -9,7 +9,7 @@ /** * @Author: zhoulijun * @Time: 2019-03-08 16:19 - * @Description: 功能描述 + * @Description: Function Description */ public class TransferReq extends BaseReq { diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MessageProcessor.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MessageProcessor.java index 8da5127466..06d5cbb651 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MessageProcessor.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MessageProcessor.java @@ -3,14 +3,14 @@ public interface MessageProcessor { /** - * 获取要处理的消息对应的cmd + * Obtain the corresponding message to be processedcmd * * @return */ String getCmd(); /** - * 消息处理方法 + * Message processing methods * * @param chainId * @param message diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java index 7050aa4bd4..23177086a0 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ModuleHelper.java @@ -8,7 +8,7 @@ import java.util.Set; /** - * 辅助类，判断节点是够支持一些额外的功能 + * Auxiliary class, determining whether the node is capable of supporting some additional functions * * @author captain * @version 1.0 @@ -17,15 +17,15 @@ public class ModuleHelper { /** - * 是否支持协议升级功能 + * Does it support protocol upgrade functionality */ private static boolean supportProtocolUpdate; /** - * 是否支持智能合约功能 + * Does it support smart contract functionality */ private static boolean supportSmartContract; /** - * 是否支持跨链功能 + * Does it support cross chain functionality */ private static boolean supportCrossChain; diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MsgProperty.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MsgProperty.java index bb3680b112..b3d612acbf 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MsgProperty.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/MsgProperty.java @@ -1,7 +1,7 @@ package io.nuls.base.protocol; /** - * 交易属性 + * Transaction attributes * Transaction attribute * * @author tag @@ -10,39 +10,39 @@ public enum MsgProperty { /** - * 批量获取区块结束时返回的结束消息 + * End message returned at the end of bulk block retrieval */ COMPLETE_MESSAGE("complete", "complete"), /** - * 完整的区块消息 + * Complete block message */ BLOCK_MESSAGE("block", "block"), /** - * 根据区块HASH获取区块 + * Based on blocksHASHGet blocks */ GET_BLOCK_MESSAGE("getBlock", "getBlock"), /** - * 转发区块 + * Forwarding blocks */ FORWARD_SMALL_BLOCK_MESSAGE("forward", "forward"), /** - * 批量获取小区块消息 + * Batch acquisition of community block messages */ GET_BLOCKS_BY_HEIGHT_MESSAGE("getBlocks", "getBlocks"), /** - * 批量获取交易 + * Batch acquisition of transactions */ GET_TXGROUP_MESSAGE("getTxs", "getTxs"), /** - * 小区块消息 + * Community block messages */ SMALL_BLOCK_MESSAGE("sBlock", "sBlock"), /** - * 获取小区块消息 + * Get community block messages */ GET_SMALL_BLOCK_MESSAGE("getsBlock", "getsBlock"), /** - * 批量交易消息 + * Batch transaction messages */ TXGROUP_MESSAGE("txs", "txs"); diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/Protocol.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/Protocol.java index c7d17f0b52..a45d337faf 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/Protocol.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/Protocol.java @@ -3,7 +3,7 @@ import java.util.Set; /** - * 协议信息 + * Protocol Information * * @author captain * @version 1.0 diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolConstant.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolConstant.java index 1e23959451..50d00581d8 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolConstant.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolConstant.java @@ -5,12 +5,12 @@ public class ProtocolConstant { /** - * 协议配置信息排序器 + * Protocol Configuration Information Sorter */ public static Comparator PROTOCOL_CONFIG_COMPARATOR = Comparator.comparingInt(ProtocolConfigJson::getVersion); /** - * 协议配置文件名称 + * Protocol configuration file name * Protocol configuration file name. */ public static String PROTOCOL_CONFIG_FILE = "protocol-config.json"; diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroup.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroup.java index 1990d26bd7..a9492c252b 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroup.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroup.java @@ -5,12 +5,12 @@ public class ProtocolGroup { /** - * 当前协议版本 + * Current protocol version */ private short version; /** - * 所有协议版本(包括消息、交易映射) + * All protocol versions(Including messages、Transaction mapping) */ private Map protocolsMap; diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java index e1bfd1118f..6803fd30e6 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java @@ -65,7 +65,7 @@ public static void init(int chainId, Map protocolMap, short ver } /** - * 获取当前生效的协议版本号 + * Obtain the current effective protocol version number * * @param chainId * @return @@ -75,7 +75,7 @@ public static Short getCurrentVersion(int chainId) { } /** - * 获取当前生效的协议版本(包含消息、交易详细信息) + * Obtain the current effective protocol version(Include messages、Transaction Details) * * @param chainId * @return @@ -104,7 +104,7 @@ public static void updateProtocol(int chainId, short protocolVersion) { } ProtocolGroup protocolGroup = protocolGroupMap.get(chainId); Protocol protocol = protocolGroup.getProtocolsMap().get(protocolVersion); - //如果不存在给定版本号的协议信息，则取比当前版本号小的最大的一个协议 + //If there is no protocol information for the given version number, take the largest protocol smaller than the current version number if (protocol == null) { Set sortKey = new TreeSet<>(protocolGroup.getProtocolsMap().keySet()); short effectiveVersion = 1; diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolLoader.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolLoader.java index fe09eb8280..a5b8ac285a 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolLoader.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolLoader.java @@ -10,7 +10,7 @@ import static io.nuls.base.protocol.ProtocolConstant.PROTOCOL_CONFIG_FILE; /** - * 把协议配置文件解析成对象 + * Parse protocol configuration files into objects * * @author captain * @version 1.0 @@ -19,7 +19,7 @@ public class ProtocolLoader { /** - * 默认的初始协议号 + * Default initial protocol number */ static final short DEFAULT_BEGIN_PROTOCOL_VERSION = 1; @@ -49,9 +49,9 @@ public static void load(int chainId, String protocolConfigJson) throws Exception List msg = validMessages.stream().map(MessageDefine::getName).collect(Collectors.toList()); discardMsgs.addAll(parent.getInvalidMsgs()); discardMsgs.removeIf(msg::contains); - //添加上一个版本的生效信息 + //Add the effective information of the previous version msgList.addAll(parent.getAllowMsg()); - //实现更新功能 + //Implement update function msgList.removeIf(e -> msg.contains(e.getName())); List tx = validTransactions.stream().map(TxDefine::getType).collect(Collectors.toList()); discardTxs.addAll(parent.getInvalidTxs()); @@ -80,9 +80,9 @@ public static void load(int chainId) throws Exception { } /** - * 加载协议 - * @param chainId 链ID - * @param loadProtocol 是否加载消息及交易的协议信息 + * Load Protocol + * @param chainId chainID + * @param loadProtocol Whether to load protocol information for messages and transactions * @throws Exception */ public static void load(int chainId, boolean loadProtocol) throws Exception { diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/RegisterHelper.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/RegisterHelper.java index 780df34e13..fa32c326a2 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/RegisterHelper.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/RegisterHelper.java @@ -10,7 +10,7 @@ import java.util.*; /** - * 帮助模块实现自动注册交易、注册消息的工具类 + * Help the module achieve automatic registration of transactions、Tool class for registering messages * * @author captain * @version 1.0 @@ -19,7 +19,7 @@ public class RegisterHelper { /** - * 向交易模块注册交易 + * Register transactions with the trading module * Register transactions with the transaction module */ public static boolean registerTx(int chainId, Protocol protocol, String moduleCode) { @@ -38,7 +38,7 @@ public static boolean registerTx(int chainId, Protocol protocol, String moduleCo if (txRegisterDetailList.isEmpty()) { return true; } - //向交易管理模块注册交易 + //Register transactions with the transaction management module Map params = new HashMap<>(); params.put(Constants.VERSION_KEY_STR, "1.0"); params.put(Constants.CHAIN_ID, chainId); @@ -57,7 +57,7 @@ public static boolean registerTx(int chainId, Protocol protocol, String moduleCo } /** - * 向交易模块注册交易 + * Register transactions with the trading module * Register transactions with the transaction module */ public static boolean registerTx(int chainId, Protocol protocol) { @@ -65,7 +65,7 @@ public static boolean registerTx(int chainId, Protocol protocol) { } /** - * 向网络模块注册消息 + * Register messages with the network module * * @return */ @@ -87,7 +87,7 @@ public static boolean registerMsg(Protocol protocol, String role) { } /** - * 向网络模块注册消息 + * Register messages with the network module * * @return */ @@ -96,7 +96,7 @@ public static boolean registerMsg(Protocol protocol) { } /** - * 向协议升级模块注册多版本协议配置 + * Register multi version protocol configuration with protocol upgrade module * Register transactions with the transaction module */ public static boolean registerProtocol(int chainId) { diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TransactionProcessor.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TransactionProcessor.java index c18e867001..c7f1e3d55e 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TransactionProcessor.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TransactionProcessor.java @@ -12,7 +12,7 @@ import java.util.Map; /** - * 交易处理器 + * Transaction processor * * @author captain * @version 1.0 @@ -21,55 +21,55 @@ public interface TransactionProcessor { /** - * 获取该交易器绑定的交易类型,参见{@link TxType} + * Obtain the transaction type bound to this trader,See also{@link TxType} * * @return */ int getType(); /** - * 根据处理优先级进行排序 + * Sort based on processing priority */ Comparator COMPARATOR = Comparator.comparingInt(TransactionProcessor::getPriority); /** - * 验证接口 + * Verify Interface * - * @param chainId 链Id - * @param txs 类型为{@link #getType()}的所有交易集合 - * @param txMap 不同交易类型与其对应交易列表键值对 - * @param blockHeader 区块头 - * @return 验证错误码和未通过验证的交易,需要丢弃 + * @param chainId chainId + * @param txs Type is{@link #getType()}All transaction sets for + * @param txMap Different transaction types and their corresponding transaction list key value pairs + * @param blockHeader Block head + * @return Verification error codes and transactions that did not pass verification,Need to discard */ - @ResponseData(description = "返回一个map，map中包含验证错误码和未通过验证的交易", responseType = @TypeDescriptor(value = Map.class, mapKeys = { - @Key(name = "errorCode", description = "错误码"), - @Key(name = "txList", valueType = List.class, valueElement = Transaction.class, description = "返回类型为List") + @ResponseData(description = "Return amap,mapIt contains verification error codes and transactions that did not pass verification", responseType = @TypeDescriptor(value = Map.class, mapKeys = { + @Key(name = "errorCode", description = "Error code"), + @Key(name = "txList", valueType = List.class, valueElement = Transaction.class, description = "The return type isList") })) Map validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader); //List validate(int chainId, List txs, Map> txMap, BlockHeader blockHeader); /** - * 提交接口 + * Submit Interface * - * @param chainId 链Id - * @param txs 类型为{@link #getType()}的所有交易集合 - * @param blockHeader 区块头 - * @return 是否提交成功 + * @param chainId chainId + * @param txs Type is{@link #getType()}All transaction sets for + * @param blockHeader Block head + * @return Whether the submission was successful */ boolean commit(int chainId, List txs, BlockHeader blockHeader); /** - * 回滚接口 + * Rollback interface * - * @param chainId 链Id - * @param txs 类型为{@link #getType()}的所有交易集合 - * @param blockHeader 区块头 - * @return 是否回滚成功 + * @param chainId chainId + * @param txs Type is{@link #getType()}All transaction sets for + * @param blockHeader Block head + * @return Is the rollback successful */ boolean rollback(int chainId, List txs, BlockHeader blockHeader); /** - * 获取处理优先级,数字越大,优先级越高 + * Get processing priority,The larger the number, the more,The higher the priority, the higher the priority * * @return */ diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TxRegisterDetail.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TxRegisterDetail.java index c0ef5d9680..8303ebb58d 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TxRegisterDetail.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/TxRegisterDetail.java @@ -4,42 +4,42 @@ import io.nuls.core.rpc.model.ApiModelProperty; /** - * 交易注册类 + * Transaction registration class * Transaction registration class * */ -@ApiModel(description = "交易注册") +@ApiModel(description = "Transaction registration") public class TxRegisterDetail { /** - * 交易类型 + * Transaction type * Transaction type */ - @ApiModelProperty(description = "交易类型") + @ApiModelProperty(description = "Transaction type") private int txType; /** - * 是否是系统交易 + * Is it a system transaction * Is it a system transaction */ - @ApiModelProperty(description = "是否是系统交易") + @ApiModelProperty(description = "Is it a system transaction") private boolean systemTx; /** - * 是否是解锁交易 + * Is it an unlocked transaction * Is it a unlock transaction */ - @ApiModelProperty(description = "是否是解锁交易") + @ApiModelProperty(description = "Is it an unlocked transaction") private boolean unlockTx; /** - * 交易是否需要签名 + * Do transactions require signatures * Is it a sign-required transaction */ - @ApiModelProperty(description = "交易是否需要签名") + @ApiModelProperty(description = "Do transactions require signatures") private boolean verifySignature; /** - * 交易是否需要验证手续费 + * Do transactions require verification fees * Is it a fee-validate-required transaction */ - @ApiModelProperty(description = "交易是否需要验证手续费") + @ApiModelProperty(description = "Do transactions require verification fees") private boolean verifyFee; public int getTxType() { diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java index 7b849390e5..357b812083 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/CommonProtocolCmd.java @@ -38,11 +38,11 @@ import java.util.Map; /** - * 协议版本变更统一通知接口 + * Unified Notification Interface for Protocol Version Changes * * @author captain * @version 1.0 - * @date 18-11-14 下午4:23 + * @date 18-11-14 afternoon4:23 */ @Component @NulsCoresCmd(module = ModuleE.NC) diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java index 32fbfd52a7..3abdee21a5 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java @@ -18,7 +18,7 @@ import java.util.Map; /** - * 消息统一分发，各个有消息要处理的模块写具体实现 + * Unified distribution of messages, specific implementation of modules with messages to be processed * * * @author captain @@ -41,7 +41,7 @@ public void setProcessors(List processors) { } /** - * 获取最新主链高度 + * Get the latest main chain height * * @param params * @return @@ -67,4 +67,4 @@ public Response msgProcess(Map params) { } return success(); } -} \ No newline at end of file +} diff --git a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java index 2099315bda..eb1ce37070 100644 --- a/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java +++ b/common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/TransactionDispatcher.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; /** - * 交易分发器 + * Transaction distributor * * @author captain * @version 1.0 @@ -55,7 +55,7 @@ public void setProcessors(List processors) { public void register(ModuleE module, CommonAdvice commitAdvice, CommonAdvice rollbackAdvice) { if (module == ModuleE.SC) { - // 跨链模块的token跨链转入交易，需要把普通跨链交易转换成调用合约交易来写入系统跨链合约 + // Cross chain moduletokenCross chain transfer transactions require converting regular cross chain transactions into call contract transactions to be written into system cross chain contracts if (commitAdvice != null) { commitAdviceMap.put(String.valueOf(TxType.CROSS_CHAIN), commitAdvice); } @@ -63,7 +63,7 @@ public void register(ModuleE module, CommonAdvice commitAdvice, CommonAdvice rol rollbackAdviceMap.put(String.valueOf(TxType.CROSS_CHAIN), rollbackAdvice); } } - // 按实际模块注册 + // Register according to actual modules if (commitAdvice != null) { commitAdviceMap.put(module.abbr, commitAdvice); } @@ -73,7 +73,7 @@ public void register(ModuleE module, CommonAdvice commitAdvice, CommonAdvice rol } /** - * 获取最新主链高度 + * Get the latest main chain height * * @param params * @return @@ -133,7 +133,7 @@ public Response txValidator(Map params) { } /** - * 获取最新主链高度 + * Get the latest main chain height * * @param params * @return @@ -173,7 +173,7 @@ public Response txCommit(Map params) { if (transactions.isEmpty()) { continue; } - // 按实际模块调用 + // Call according to actual module if (!commitAdviceBegin) { commitAdviceBegin = true; String moduleCode = ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(processor.getType()); @@ -203,7 +203,7 @@ public Response txCommit(Map params) { } /** - * 获取最新主链高度 + * Get the latest main chain height * * @param params * @return @@ -243,7 +243,7 @@ public Response txRollback(Map params) { if (transactions.isEmpty()) { continue; } - // 按实际模块调用 + // Call according to actual module if (!rollbackAdviceBegin) { rollbackAdviceBegin = true; String moduleCode = ResponseMessageProcessor.TX_TYPE_MODULE_MAP.get(processor.getType()); diff --git a/common/nuls-base-protocol-update/src/test/java/io/nuls/base/protocol/ProtocolLoaderTest.java b/common/nuls-base-protocol-update/src/test/java/io/nuls/base/protocol/ProtocolLoaderTest.java index d618f05279..bdf1891c4a 100644 --- a/common/nuls-base-protocol-update/src/test/java/io/nuls/base/protocol/ProtocolLoaderTest.java +++ b/common/nuls-base-protocol-update/src/test/java/io/nuls/base/protocol/ProtocolLoaderTest.java @@ -10,4 +10,4 @@ public void name() throws Exception { String read = IoUtils.read("protocol-config.json"); ProtocolLoader.load(2, read); } -} \ No newline at end of file +} diff --git a/common/nuls-base-protocol-update/src/test/resources/protocol-config.json b/common/nuls-base-protocol-update/src/test/resources/protocol-config.json index 2bbc047b8d..9c4b0ab638 100644 --- a/common/nuls-base-protocol-update/src/test/resources/protocol-config.json +++ b/common/nuls-base-protocol-update/src/test/resources/protocol-config.json @@ -120,4 +120,4 @@ "invalidTxs": "4", "invalidMsgs": "Message2" } -] \ No newline at end of file +] diff --git a/common/nuls-base/src/main/java/io/nuls/base/RPCUtil.java b/common/nuls-base/src/main/java/io/nuls/base/RPCUtil.java index b80bec2651..cf4cd60bc8 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/RPCUtil.java +++ b/common/nuls-base/src/main/java/io/nuls/base/RPCUtil.java @@ -56,7 +56,7 @@ public static T getInstance(byte[] bytes, Class claz } /** - * RPCUtil 反序列化 + * RPCUtil Deserialization * * @param data * @param clazz diff --git a/common/nuls-base/src/main/java/io/nuls/base/basic/AddressPrefixInf.java b/common/nuls-base/src/main/java/io/nuls/base/basic/AddressPrefixInf.java index 8635669cf3..101a9f59bf 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/basic/AddressPrefixInf.java +++ b/common/nuls-base/src/main/java/io/nuls/base/basic/AddressPrefixInf.java @@ -33,7 +33,7 @@ */ public interface AddressPrefixInf { /** - * 同步地址前缀信息 + * Synchronize address prefix information */ Map syncAddressPrefix(); } diff --git a/common/nuls-base/src/main/java/io/nuls/base/basic/AddressTool.java b/common/nuls-base/src/main/java/io/nuls/base/basic/AddressTool.java index 0c7f1b8f0d..b3d7b94a7f 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/basic/AddressTool.java +++ b/common/nuls-base/src/main/java/io/nuls/base/basic/AddressTool.java @@ -121,7 +121,7 @@ public class AddressTool { BLOCK_HOLE_ADDRESS_SET_5.add("NULSd6HgjYXoMgRa89jDeHcEV7B5JCEhhWqm2"); } /** - * chainId-地址映射表 + * chainId-Address Mapping Table */ private static Map ADDRESS_PREFIX_MAP = new HashMap(); @@ -193,7 +193,7 @@ public static String getRealAddress(String addressString) { } /** - * 根据地址字符串查询地址字节数组 + * Query address byte array based on address string * * @param addressString * @return @@ -208,7 +208,7 @@ public static byte[] getAddress(String addressString) { } /** - * 根据公钥查询地址字节数组 + * Query address byte array based on public key * * @param publicKey * @param chainId @@ -221,9 +221,9 @@ public static String getAddressString(byte[] publicKey, int chainId) { } /** - * 根据地址字符串解码出地址原始字节数组 + * Decode the original byte array of the address based on the address string * base58(chainId)+_+base58(addressType+hash160(pubKey)+XOR(addressType+hash160(pubKey))) - * addressType在原始数据后补位0 + * addressTypePlace after the original data0 * * @param addressString * @return @@ -256,7 +256,7 @@ public static byte[] getAddressByRealAddr(String addressString) { } /** - * 根据地址字符串查询地址所属链ID + * Query the chain to which the address belongs based on the address stringID * * @param addressString * @return @@ -275,7 +275,7 @@ public static int getChainIdByAddress(String addressString) { } /** - * 根据公钥查询地址字节数组 + * Query address byte array based on public key * * @param publicKey * @param chainId @@ -287,7 +287,7 @@ public static byte[] getAddress(byte[] publicKey, int chainId) { } /** - * 根据公钥查询地址字节数组 + * Query address byte array based on public key * * @param publicKeyStr * @param chainId @@ -319,7 +319,7 @@ public static byte[] getAddress(byte[] publicKey, int chainId, String prefix) { } /** - * 生成校验位，根据以下字段生成：addressType+hash160(pubKey) + * Generate checksums based on the following fields：addressType+hash160(pubKey) * * @param body * @return @@ -333,7 +333,7 @@ private static byte getXor(byte[] body) { } /** - * 检查校验位是否正确，XOR(addressType+hash160(pubKey)) + * Check if the checksum is correct,XOR(addressType+hash160(pubKey)) * * @param hashs */ @@ -352,7 +352,7 @@ public static void checkXOR(byte[] hashs) { } /** - * 验证地址字符串是否是有效地址 + * Verify if the address string is a valid address * * @param address * @param chainId @@ -405,7 +405,7 @@ public static boolean validAddress(int chainId, String address) { } /** - * 通过地址获得chainId + * Obtain through addresschainId * * @param bytes * @return @@ -425,7 +425,7 @@ public static int getChainIdByAddress(byte[] bytes) { } /** - * 校验是否是普通地址 + * Verify if it is a regular address * * @param bytes * @param chainId @@ -455,7 +455,7 @@ public static boolean validNormalAddress(byte[] bytes, int chainId) { } /** - * 校验是否是智能合约地址 + * Verify if it is a smart contract address * * @param addressBytes * @param chainId @@ -488,7 +488,7 @@ public static boolean validContractAddress(byte[] addressBytes, int chainId) { } /** - * 根据地址字节数组生成地址字符串 + * Generate address string based on address byte array * base58(chainId)+_+base58(addressType+hash160(pubKey)+XOR(addressType+hash160(pubKey))) * * @param addressBytes diff --git a/common/nuls-base/src/main/java/io/nuls/base/basic/ProtocolVersion.java b/common/nuls-base/src/main/java/io/nuls/base/basic/ProtocolVersion.java index e05f1ae5b4..54f1af88e9 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/basic/ProtocolVersion.java +++ b/common/nuls-base/src/main/java/io/nuls/base/basic/ProtocolVersion.java @@ -8,28 +8,28 @@ import java.util.Comparator; /** - * 协议版本 + * Protocol version * * @author captain * @version 1.0 - * @date 19-1-30 下午3:23 + * @date 19-1-30 afternoon3:23 */ public class ProtocolVersion extends BaseNulsData { public static final Comparator COMPARATOR = Comparator.comparingInt(ProtocolVersion::getVersion); /** - * 协议版本号 + * Protocol version number */ private short version; /** - * 每个统计区间内的最小生效比例(60-100) + * The minimum effective ratio within each statistical interval(60-100) */ private byte effectiveRatio; /** - * 协议生效要满足的连续区间数(50-1000) + * The number of consecutive intervals that the agreement must meet in order to take effect(50-1000) */ private short continuousIntervalCount; diff --git a/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionFeeCalculator.java b/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionFeeCalculator.java index d7027bb2d9..d7f6ae67e6 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionFeeCalculator.java +++ b/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionFeeCalculator.java @@ -44,9 +44,9 @@ public class TransactionFeeCalculator { public static final int KB = 1024; /** - * 根据交易大小计算需要交纳的手续费 + * Calculate the required transaction fees based on the size of the transaction * According to the transaction size calculate the handling fee. - * @param size 交易大小/size of the transaction + * @param size Transaction size/size of the transaction */ public static final BigInteger getNormalTxFee(int size) { BigInteger fee = NORMAL_PRICE_PRE_1024_BYTES.multiply(new BigInteger(String.valueOf(size/KB))); @@ -57,9 +57,9 @@ public static final BigInteger getNormalTxFee(int size) { } /** - * 根据交易大小计算需要交纳的手续费 + * Calculate the required transaction fees based on the size of the transaction * According to the transaction size calculate the handling fee. - * @param size 交易大小/size of the transaction + * @param size Transaction size/size of the transaction */ public static final BigInteger getConsensusTxFee(int size,long unit) { BigInteger unitBigInteger = BigInteger.valueOf(unit); @@ -71,9 +71,9 @@ public static final BigInteger getConsensusTxFee(int size,long unit) { } /** - * 根据未签名的交易大小计算需要交纳的手续费 - * @param size 未签名的交易大小/ size of the unsigned transaction - * @return 交易手续费 + * Calculate the handling fee to be paid based on the size of unsigned transactions + * @param size Unsigned transaction size/ size of the unsigned transaction + * @return Transaction fees */ public static final BigInteger getNormalUnsignedTxFee(int size) { size += P2PHKSignature.SERIALIZE_LENGTH; @@ -85,9 +85,9 @@ public static final BigInteger getNormalUnsignedTxFee(int size) { } /** - * 根据交易大小计算需要交纳的手续费 + * Calculate the required transaction fees based on the size of the transaction * According to the transaction size calculate the handling fee. - * @param size 交易大小/size of the transaction + * @param size Transaction size/size of the transaction */ public static final BigInteger getCrossTxFee(int size) { BigInteger fee = CROSSTX_PRICE_PRE_1024_BYTES.multiply(new BigInteger(String.valueOf(size/KB))); @@ -98,9 +98,9 @@ public static final BigInteger getCrossTxFee(int size) { } /** - * 根据交易大小计算需要交纳的手续费 + * Calculate the required transaction fees based on the size of the transaction * According to the transaction size calculate the handling fee. - * @param size 交易大小/size of the transaction + * @param size Transaction size/size of the transaction */ public static final BigInteger getFee(int size, BigInteger price) { if(price.compareTo(NORMAL_PRICE_PRE_1024_BYTES)<0){ diff --git a/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionManager.java b/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionManager.java index 5055634f7e..9909b45543 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionManager.java +++ b/common/nuls-base/src/main/java/io/nuls/base/basic/TransactionManager.java @@ -31,10 +31,10 @@ import java.util.List; /** - * 交易反序列化工具 + * Transaction Deserialization Tool * * @author captain - * @date 18-12-6 下午5:02 + * @date 18-12-6 afternoon5:02 * @version 1.0 */ public class TransactionManager { diff --git a/common/nuls-base/src/main/java/io/nuls/base/cache/DataCacher.java b/common/nuls-base/src/main/java/io/nuls/base/cache/DataCacher.java index 806c3bbf56..f688991969 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/cache/DataCacher.java +++ b/common/nuls-base/src/main/java/io/nuls/base/cache/DataCacher.java @@ -27,11 +27,11 @@ import java.util.concurrent.CompletableFuture; /** - * 异步请求响应结果缓存类 + * Asynchronous request response result caching class * * @author captain * @version 1.0 - * @date 18-11-12 下午2:35 + * @date 18-11-12 afternoon2:35 */ public class DataCacher { diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/Address.java b/common/nuls-base/src/main/java/io/nuls/base/data/Address.java index 0ddb9dfb66..7bc0a144ca 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/Address.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/Address.java @@ -56,7 +56,7 @@ public class Address { private int chainId; /** - * 字符串格式表示的地址 + * Address represented in string format */ private String addressStr; @@ -180,7 +180,7 @@ public static int size() { } /** - * 默认返回base58编码的地址 + * Default returnbase58Encoded address * * @return */ diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/BaseBusinessMessage.java b/common/nuls-base/src/main/java/io/nuls/base/data/BaseBusinessMessage.java index 3c139e3cd9..85ac71c552 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/BaseBusinessMessage.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/BaseBusinessMessage.java @@ -30,11 +30,11 @@ import java.io.IOException; /** - * 通用消息体 + * General message body * * @author captain * @version 1.0 - * @date 18-11-20 上午10:44 + * @date 18-11-20 morning10:44 */ public abstract class BaseBusinessMessage extends BaseNulsData { diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/Block.java b/common/nuls-base/src/main/java/io/nuls/base/data/Block.java index 874e6884cf..8a57ea5a52 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/Block.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/Block.java @@ -44,7 +44,7 @@ public class Block extends BaseNulsData implements Cloneable { private List txs; private transient List txHashList; /** - * 该区块来自哪个节点，主要用于孤儿区块的维护 + * Which node does this block come from, mainly used for maintaining orphan blocks */ private transient String nodeId; @@ -104,7 +104,7 @@ public void setHeader(BlockHeader header) { } // /** -// * 从交易列表中循环取出所有的交易hash，顺序和交易列表保持一致 +// * Retrieve all transactions from the transaction list in a loophashKeep the order consistent with the transaction list // * Loop through the list of trades to remove all of the trading hash, in the same order as the list of transactions. // */ public List getTxHashList() { diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/BlockExtendsData.java b/common/nuls-base/src/main/java/io/nuls/base/data/BlockExtendsData.java index 28a367db6b..40698d9e30 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/BlockExtendsData.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/BlockExtendsData.java @@ -39,47 +39,47 @@ public class BlockExtendsData extends BaseNulsData { /** - * 轮次 + * Round */ private long roundIndex; /** - * 共识节点数 + * Number of consensus nodes */ private int consensusMemberCount; /** - * 轮次起始时间 + * Start time of round */ private long roundStartTime; /** - * 轮次中的顺序 + * Order in rounds */ private int packingIndexOfRound; /** - * 主网当前生效的版本 + * The current effective version of the main network */ private short mainVersion; /** - * 区块的版本，可以理解为本地钱包的版本 + * The version of the block can be understood as the version of the local wallet */ private short blockVersion; /** - * 每个统计区间内的最小生效比例(60-100) + * The minimum effective ratio within each statistical interval(60-100) */ private byte effectiveRatio; /** - * 协议生效要满足的连续区间数(50-1000) + * The number of consecutive intervals that the agreement must meet in order to take effect(50-1000) */ private short continuousIntervalCount; /** - * 智能合约初始状态根 + * Initial state root of smart contract */ private byte[] stateRoot; @@ -131,8 +131,8 @@ public void setContinuousIntervalCount(short continuousIntervalCount) { } /** - * 根据轮次开始时间计算轮次结束时间 - * @param packingInterval 打包间隔时间（单位：秒） + * Calculate the end time of the round based on the start time of the round + * @param packingInterval Packaging interval time（unit：second） * */ public long getRoundEndTime(long packingInterval) { return roundStartTime + consensusMemberCount * packingInterval; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/BlockHeader.java b/common/nuls-base/src/main/java/io/nuls/base/data/BlockHeader.java index 77b4cc91e0..a7d8de8322 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/BlockHeader.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/BlockHeader.java @@ -44,7 +44,7 @@ public class BlockHeader extends BaseNulsData { /** - * 区块头排序器 + * Block header sorter */ public static final Comparator BLOCK_HEADER_COMPARATOR = Comparator.comparingLong(BlockHeader::getHeight); @@ -58,7 +58,7 @@ public class BlockHeader extends BaseNulsData { private byte[] extend; private transient BlockExtendsData extendsData; /** - * pierre add 智能合约世界状态根 + * pierre add Smart Contract World State Root */ private transient byte[] stateRoot; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/Coin.java b/common/nuls-base/src/main/java/io/nuls/base/data/Coin.java index c8037ca3ec..00d1352f24 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/Coin.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/Coin.java @@ -33,22 +33,22 @@ public abstract class Coin extends BaseNulsData { /** - * byte[24] 账户地址 + * byte[24] Account address */ protected byte[] address; /** - * uint16 资产发行链的id + * uint16 Asset issuance chainid */ protected int assetsChainId; /** - * uint16 资产id + * uint16 assetid */ protected int assetsId; /** - * uint128 数量 + * uint128 quantity */ protected BigInteger amount; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/CoinData.java b/common/nuls-base/src/main/java/io/nuls/base/data/CoinData.java index 66caa6d7b9..e83d192286 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/CoinData.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/CoinData.java @@ -154,7 +154,7 @@ public void addFrom(CoinFrom coinFrom) { } /** - * 从CoinData中获取和交易相关的地址(缺少txData中相关地址，需要对应的交易单独获取) + * fromCoinDataObtain and transact related addresses from(lacktxDataThe relevant address needs to be obtained separately for the corresponding transaction) * * @return */ @@ -202,10 +202,10 @@ public int getFromAddressCount(){ } /** - * 计算指定资产手续费 - * @param assetChainId 指定资产链ID - * @param assetId 指定资产ID - * @return 手续费大小 + * Calculate designated asset handling fees + * @param assetChainId Designated asset chainID + * @param assetId Designated assetsID + * @return Handling fee size * */ public BigInteger getFeeByAsset(int assetChainId, int assetId){ BigInteger fromAmount = BigInteger.ZERO; @@ -222,4 +222,4 @@ public BigInteger getFeeByAsset(int assetChainId, int assetId){ } return fromAmount.subtract(toAmount); } -} \ No newline at end of file +} diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java b/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java index 70cda9642c..e5ac34912e 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/CoinFrom.java @@ -22,7 +22,7 @@ public class CoinFrom extends Coin { private byte[] nonce; /** - * 0普通交易，-1解锁金额交易（退出共识，退出委托） + * 0Ordinary transactions,-1Unlock amount transaction（Exit consensus, exit delegation） */ private byte locked; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/CoinTo.java b/common/nuls-base/src/main/java/io/nuls/base/data/CoinTo.java index be63ed98ad..040713339e 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/CoinTo.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/CoinTo.java @@ -16,7 +16,7 @@ public class CoinTo extends Coin { /** - * 解锁时间，-1为永久锁定 + * Unlocking time,-1To permanently lock */ private long lockTime; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/MultiSigAccount.java b/common/nuls-base/src/main/java/io/nuls/base/data/MultiSigAccount.java index fd52a8a6a3..7370998e67 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/MultiSigAccount.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/MultiSigAccount.java @@ -36,7 +36,7 @@ import java.util.List; /** - * 多签地址账户 + * Multiple address accounts * * @author: qinyifeng * @date: 2018/12/12 diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/NonceHashData.java b/common/nuls-base/src/main/java/io/nuls/base/data/NonceHashData.java index 2f63027fef..c20c7fc96b 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/NonceHashData.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/NonceHashData.java @@ -25,9 +25,9 @@ package io.nuls.base.data; /** - * 本地发交易时缓存交易hash并且记录时间, - * 下次发起交易计算nonce值时, - * 如果已过期则nonce值从账本中获取 + * Cache transactions when sending transactions locallyhashAnd record the time, + * Next transaction calculation initiatednonceValue time, + * If it has expired, thennonceValue obtained from ledger * * @author: Charlie * @date: 2019/3/11 @@ -35,12 +35,12 @@ public class NonceHashData { /** - * 交易hash + * transactionhash */ private NulsHash hash; /** - * hash值缓存时的时间戳 + * hashTimestamp during value caching */ private long cacheTimestamp; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/NulsSignData.java b/common/nuls-base/src/main/java/io/nuls/base/data/NulsSignData.java index b42e67b879..a32bb04b7a 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/NulsSignData.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/NulsSignData.java @@ -42,7 +42,7 @@ public class NulsSignData extends BaseNulsData { /** - * 签名字节组 + * Signature Byte Group */ protected byte[] signBytes; diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/RedPunishData.java b/common/nuls-base/src/main/java/io/nuls/base/data/RedPunishData.java index 6a60a5477b..28a4a9c963 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/RedPunishData.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/RedPunishData.java @@ -35,7 +35,7 @@ import java.util.Set; /** - * 红牌惩罚信息类 + * Red card punishment information category * Red Card Punishment Information Category * * @author tag diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/SmallBlock.java b/common/nuls-base/src/main/java/io/nuls/base/data/SmallBlock.java index 46d49c9e79..6ad92df074 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/SmallBlock.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/SmallBlock.java @@ -35,7 +35,7 @@ import java.util.List; /** - * 小区块，用于新区块打包完成后进行广播，小区块中包含区块头、块中交易hash列表、打包过程中产生的交易（其他节点一定没有的交易） + * Small block, used for broadcasting after the packaging of new blocks is completed, and the small block contains the block header、Block in block transactionshashlist、Transactions generated during the packaging process（Transactions that other nodes must not have） * Block block, used for broadcasting after the new block is packaged, * and the blocks in the block are included in the block header ,tx hash list of the block * and the transaction generated in the packaging process (other transactions that must not be made by other nodes). @@ -45,19 +45,19 @@ */ public class SmallBlock extends BaseNulsData { /** - * 区块头 + * Block head * block header */ private BlockHeader header; /** - * 交易摘要列表 + * Transaction Summary List * transaction hash list */ private ArrayList txHashList; /** - * 系统交易列表（其他节点一定没有的交易，如共识奖励交易、红牌交易、黄牌交易） + * System transaction list（Transactions that other nodes must not have, such as consensus reward transactions、Red card trading、Yellow card trading） * Consensus trading list (transactions that no other node must have) */ private List systemTxList = new ArrayList<>(); @@ -110,7 +110,7 @@ public void parse(NulsByteBuffer byteBuffer) throws NulsException { } /** - * 区块头 + * Block head * block header * * @return BlockHeader @@ -124,7 +124,7 @@ public void setHeader(BlockHeader header) { } // /** -// * 交易摘要列表 +// * Transaction Summary List // * transaction hash list // */ public ArrayList getTxHashList() { @@ -136,7 +136,7 @@ public void setTxHashList(ArrayList txHashList) { } // /** -// * 共识交易列表（其他节点一定没有的交易） +// * Consensus Transaction List（Transactions that other nodes must not have） // * Consensus trading list (transactions that no other node must have) // */ public List getSystemTxList() { diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/Transaction.java b/common/nuls-base/src/main/java/io/nuls/base/data/Transaction.java index 1f802ab136..4fbd888895 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/Transaction.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/Transaction.java @@ -67,7 +67,7 @@ public class Transaction extends BaseNulsData implements Cloneable { private transient CoinData coinDataInstance; /** - * 在区块中的顺序，存储在rocksDB中是无序的，保存区块时赋值，取出后根据此值排序 + * Order in blocks, stored inrocksDBThe middle is unordered, assigned values when saving blocks, sorted based on this value after retrieval */ private int inBlockIndex; @@ -250,7 +250,7 @@ public static Transaction getInstance(byte[] txBytes) throws NulsException { } /** - * 获取交易的手续费 + * Obtaining transaction fees * @return * @throws NulsException */ @@ -274,7 +274,7 @@ public BigInteger getFee() throws NulsException { } /** - * 判断交易是否为多签交易 + * Determine whether the transaction is a multi signature transaction * Judging whether a transaction is a multi-signature transaction */ public boolean isMultiSignTx() throws NulsException { diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/YellowPunishData.java b/common/nuls-base/src/main/java/io/nuls/base/data/YellowPunishData.java index 1032a3a0c6..c36840599b 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/YellowPunishData.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/YellowPunishData.java @@ -37,7 +37,7 @@ import java.util.Set; /** - * 黄牌惩罚信息类 + * Yellow card punishment information * Yellow Card Punishment Information Category * * @author tag diff --git a/common/nuls-base/src/main/java/io/nuls/base/data/po/BlockHeaderPo.java b/common/nuls-base/src/main/java/io/nuls/base/data/po/BlockHeaderPo.java index 55dd918fc5..578143caf3 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/data/po/BlockHeaderPo.java +++ b/common/nuls-base/src/main/java/io/nuls/base/data/po/BlockHeaderPo.java @@ -36,11 +36,11 @@ import java.util.List; /** - * 区块头存储对象 + * Block header storage object * * @author captain * @version 1.0 - * @date 18-12-10 下午3:50 + * @date 18-12-10 afternoon3:50 */ public class BlockHeaderPo extends BaseNulsData { diff --git a/common/nuls-base/src/main/java/io/nuls/base/script/Script.java b/common/nuls-base/src/main/java/io/nuls/base/script/Script.java index 24ec9f2c87..ab0e78c4e1 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/script/Script.java +++ b/common/nuls-base/src/main/java/io/nuls/base/script/Script.java @@ -198,7 +198,7 @@ public List getChunks() { * This is necessary to render the to/from addresses of transactions in a user interface. * Bitcoin Core does something similar.

*

- * 将输入流解析为脚本 + * Parse input stream into script */ private void parse(byte[] program) throws ScriptException { chunks = new ArrayList(5); // Common size. @@ -259,7 +259,7 @@ private void parse(byte[] program) throws ScriptException { * of operation being susceptible to man-in-the-middle attacks. It is still used in coinbase outputs and can be * useful more exotic types of transaction, but today most payments are to addresses. *

- * 根据公钥生成的脚本(scriptPublicKey) + * Script generated based on public key(scriptPublicKey) */ public boolean isSentToRawPubKey() { return chunks.size() == 2 && chunks.get(1).equalsOpCode(OP_CHECKSIG) && @@ -272,7 +272,7 @@ public boolean isSentToRawPubKey() { * to send somebody money with a written code because their node is offline, but over time has become the standard * way to make payments due to the short and recognizable base58 form addresses come in. *

- * 判断脚本类型是否为发送到地址 + * Determine if the script type is send to address */ public boolean isSentToAddress() { return chunks.size() == 5 && @@ -302,7 +302,7 @@ public boolean isSentToP2SH() { * *

Otherwise it throws a ScriptException.

*

- * 获取公钥HASH + * Obtain public keyHASH */ public byte[] getPubKeyHash() throws ScriptException { if (isSentToAddress()) { @@ -322,7 +322,7 @@ public byte[] getPubKeyHash() throws ScriptException { * * @throws ScriptException if the script is none of the named forms. *

- * 获取公钥 + * Obtain public key */ public byte[] getPubKey() throws ScriptException { if (chunks.size() != 2) { @@ -380,7 +380,7 @@ public BigInteger getCLTVPaymentChannelExpiry() { * For 2-element [input] scripts assumes that the paid-to-address can be derived from the public key. * The concept of a "from address" isn't well defined in Bitcoin and you should not assume the sender of a * transaction can actually receive coins on it. This method may be removed in future. - * 获取支付地址 + * Obtain payment address * */ /*@Deprecated @@ -390,7 +390,7 @@ public Address getFromAddress(NetworkParameters params) throws ScriptException { /** * Gets the destination address from this script, if it's in the required form (see getPubKey). - * 获取接受地址 + * Obtain acceptance address */ /*public Address getToAddress(NetworkParameters params) throws ScriptException { return getToAddress(params, false); @@ -420,7 +420,7 @@ else if (forcePayToPubKey && isSentToRawPubKey()) * Writes out the given byte buffer to the output stream with the correct opcode prefix * To write an integer call writeBytes(out, SerializeUtils.reverseBytes(SerializeUtils.encodeMPI(val, false))); *

- * 将输出流按正确的方式写入到字节缓冲区 + * Write the output stream to the byte buffer in the correct way */ public static void writeBytes(OutputStream os, byte[] buf) throws IOException { if (buf.length < OP_PUSHDATA1) { @@ -442,7 +442,7 @@ public static void writeBytes(OutputStream os, byte[] buf) throws IOException { /** * Creates a program that requires at least N of the given keys to sign, using OP_CHECKMULTISIG. - * 将OutputScript/scriptPublicKry 转为字节数组 用于传输 + * takeOutputScript/scriptPublicKry Convert to byte array Used for transmission */ public static byte[] createMultiSigOutputScript(int threshold, List pubkeys) { checkArgument(threshold > 0); @@ -466,7 +466,7 @@ public static byte[] createMultiSigOutputScript(int threshold, List pubke } /** - * 根据签名和公钥的字节数组转为inputScript/scriptSig 字节数组用于网络传播 + * Convert the byte array based on the signature and public key toinputScript/scriptSig Byte arrays for network propagation **/ public static byte[] createInputScript(byte[] signature, byte[] pubkey) { try { @@ -481,7 +481,7 @@ public static byte[] createInputScript(byte[] signature, byte[] pubkey) { } /** - * 根据签名的字节数组转为inputScript/scriptSig 字节数组用于网络传播 + * Convert the signed byte array toinputScript/scriptSig Byte arrays for network propagation **/ public static byte[] createInputScript(byte[] signature) { try { @@ -500,7 +500,7 @@ public static byte[] createInputScript(byte[] signature) { * Having incomplete input script allows to pass around partially signed tx. * It is expected that this program later on will be updated with proper signatures. *

- * 创建一个空Script + * Create an emptyScript */ public Script createEmptyInputScript(@Nullable ECKey key, @Nullable Script redeemScript) { if (isSentToAddress()) { @@ -950,11 +950,11 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in * is useful if you need more precise control or access to the final state of the stack. This interface is very * likely to change in future. * - * @param txContainingThis 交易 - * @param index 解锁脚本的索引 - * @param script 锁定脚本 - * @param stack 命令队列 - * @param verifyFlags 验证类型集合 + * @param txContainingThis transaction + * @param index Unlock the index of the script + * @param script Lock Script + * @param stack Command queue + * @param verifyFlags Validation Type Collection **/ public static void executeScript(@Nullable Transaction txContainingThis, long index, Script script, LinkedList stack, Set verifyFlags) throws ScriptException { @@ -1739,15 +1739,15 @@ private static int executeMultiSig(Transaction txContainingThis, int index, Scri /** * Verifies that this script (interpreted as a scriptSig) correctly spends the given scriptPubKey, enabling all - * validation rules.验证此脚本（解锁脚本）是否正确地使用给定的scriptPubKey（锁定脚本），启用所有验证规则 + * validation rules.Verify this script（Unlock Script）Whether to use the given correctlyscriptPubKey（Lock Script）Enable all validation rules * * @param txContainingThis The transaction in which this input scriptSig resides. * Accessing txContainingThis from another thread while this method runs results in undefined behavior. - * @param scriptSigIndex 交易中包含的解锁脚本的索引The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey). - * @param scriptPubKey 锁定脚本The connected scriptPubKey containing the conditions needed to claim the value. + * @param scriptSigIndex Index of unlocking scripts included in the transactionThe index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey). + * @param scriptPubKey Lock ScriptThe connected scriptPubKey containing the conditions needed to claim the value. * instead so that verification flags do not change as new verification options * are added. - * 交易，解锁脚本下标，锁定脚本 txContainingThis+scriptSigIndex用于定位解锁脚本（因为一笔交易中有可能有多个Input） + * Trading, unlocking script index, locking script txContainingThis+scriptSigIndexUsed to locate unlocking scripts（Because there may be multiple transactions in one transactionInput） */ @Deprecated public boolean correctlySpends(Transaction txContainingThis, long scriptSigIndex, Script scriptPubKey) { @@ -1761,14 +1761,14 @@ public boolean correctlyNulsSpends(Transaction txContainingThis, long scriptSigI /** * Verifies that this script (interpreted as a scriptSig) correctly spends the given scriptPubKey. * - * @param txContainingThis 交易 The transaction in which this input scriptSig resides. + * @param txContainingThis transaction The transaction in which this input scriptSig resides. * Accessing txContainingThis from another thread while this method runs results in undefined behavior. - * @param scriptSigIndex scriptSig脚本索引 The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey). + * @param scriptSigIndex scriptSigScript Index The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey). * @param scriptPubKey scriptPubKey The connected scriptPubKey containing the conditions needed to claim the value. - * @param verifyFlags 验证标识 Each flag enables one validation rule. If in doubt, use {@link #correctlySpends(Transaction, long, Script)} + * @param verifyFlags Verification identification Each flag enables one validation rule. If in doubt, use {@link #correctlySpends(Transaction, long, Script)} * which sets all flags. *

- * 验证此脚本scriptSig是否正确地使用给定的scriptPubKey + * Verify this scriptscriptSigWhether to use the given correctlyscriptPubKey */ public boolean correctlySpends(Transaction txContainingThis, long scriptSigIndex, Script scriptPubKey, Set verifyFlags) { try { @@ -1860,7 +1860,7 @@ public ScriptType getScriptType() { /** - * 签名验证 + * Signature verification */ public static boolean verifySign(byte[] digestData, byte[] signData, byte[] publicKey) { return ECKey.verify(digestData, signData, publicKey); diff --git a/common/nuls-base/src/main/java/io/nuls/base/script/ScriptBuilder.java b/common/nuls-base/src/main/java/io/nuls/base/script/ScriptBuilder.java index 658f339bcf..0b46218bbc 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/script/ScriptBuilder.java +++ b/common/nuls-base/src/main/java/io/nuls/base/script/ScriptBuilder.java @@ -35,7 +35,7 @@ * protocol at a lower level.

*/ public class ScriptBuilder { - private List chunks; //命令列表 + private List chunks; //Command List /** * Creates a fresh ScriptBuilder with an empty program. @@ -60,7 +60,7 @@ public ScriptBuilder addChunk(ScriptChunk chunk) { /** * Adds the given chunk at the given index in the program - * 添加创建好的命令到指定的下表 + * Add the created command to the specified table below */ public ScriptBuilder addChunk(int index, ScriptChunk chunk) { chunks.add(index, chunk); @@ -69,7 +69,7 @@ public ScriptBuilder addChunk(int index, ScriptChunk chunk) { /** * Adds the given opcode to the end of the program. - * 添加指定命令到列表最后 + * Add the specified command to the end of the list */ public ScriptBuilder op(int opcode) { return op(chunks.size(), opcode); @@ -77,7 +77,7 @@ public ScriptBuilder op(int opcode) { /** * Adds the given opcode to the given index in the program - * 添加指定命令到列表指定位置 + * Add the specified command to the specified position in the list */ public ScriptBuilder op(int index, int opcode) { checkArgument(opcode > OP_PUSHDATA4); @@ -86,7 +86,7 @@ public ScriptBuilder op(int index, int opcode) { /** * Adds a copy of the given byte array as a entity element (i.e. PUSHDATA) at the end of the program. - * 添加数据命令（只包含数据）到命令列表最后 + * Add Data Command（Only containing data）To the end of the command list */ public ScriptBuilder data(byte[] data) { if (data.length == 0) { @@ -98,25 +98,25 @@ public ScriptBuilder data(byte[] data) { /** * Adds a copy of the given byte array as a entity element (i.e. PUSHDATA) at the given index in the program. - * 添加数据命令（只包含数据）到命令列表指定位置 + * Add Data Command（Only containing data）To the specified position in the command list */ public ScriptBuilder data(int index, byte[] data) { // implements BIP62 byte[] copy = Arrays.copyOf(data, data.length); int opcode; /** - * 如果数据长度为0，则添加OP_0命令 + * If the data length is0Then addOP_0command * */ if (data.length == 0) { opcode = OP_0; } /** - * 如果数据长度为1 + * If the data length is1 * */ else if (data.length == 1) { byte b = data[0]; /** - * 如果数据长度为1，而且该字符大于1小于16，则添加相应的命令 + * If the data length is1And this character is greater than1less than16Then add the corresponding command * */ if (b >= 1 && b <= 16) { opcode = Script.encodeToOpN(b); @@ -125,19 +125,19 @@ else if (data.length == 1) { } } /** - * 如果数据长度小于0x4c，则添加该数据长度的命令 + * If the data length is less than0x4cThen add the command for the length of the data * */ else if (data.length < OP_PUSHDATA1) { opcode = data.length; } /** - * 如果数据长度小于256，则添加OP_PUSHDATA1（0x4c）命令 + * If the data length is less than256Then addOP_PUSHDATA1（0x4c）command * */ else if (data.length < 256) { opcode = OP_PUSHDATA1; } /** - * 如果数据长度小于65536，则添加OP_PUSHDATA2（0x4d）命令 + * If the data length is less than65536Then addOP_PUSHDATA2（0x4d）command * */ else if (data.length < 65536) { opcode = OP_PUSHDATA2; @@ -158,7 +158,7 @@ public ScriptBuilder number(long num) { /** * Adds the given number to the given index in the program. Automatically * uses shortest encoding possible. - * 添加数据命令（一个long数据）到命令列表指定位置 + * Add Data Command（Alongdata）To the specified position in the command list */ public ScriptBuilder number(int index, long num) { if (num == -1) { @@ -209,7 +209,7 @@ public ScriptBuilder smallNum(int index, int num) { * This is intended to use for negative numbers or values > 16, and although * it will accept numbers in the range 0-16 inclusive, the encoding would be * considered non-standard. - * 将给定的数字作为命令添加到程序中的给定索引中 + * Add the given number as a command to the given index in the program * * @see #(int) */ @@ -252,7 +252,7 @@ protected ScriptBuilder bigNum(int index, long num) { /** * Creates a new immutable Script based on the state of the builder. - * 根据当前命令列表创建一个不可变脚本 + * Create an immutable script based on the current command list */ public Script build() { return new Script(chunks); @@ -260,10 +260,10 @@ public Script build() { /** * Creates a scriptPubKey that encodes payment to the given address. - * 根据地址创建一个OutputScript/scriptPublicKry 转账 + * Create a new one based on the addressOutputScript/scriptPublicKry Transfer */ public static Script createOutputScript(byte[] address, int type) { - //如果是P2SH类型的创建P2SH对应的锁定脚本 + //If it isP2SHCreation of typesP2SHCorresponding locking script if (type == 0) { // OP_HASH160 OP_EQUAL return new ScriptBuilder() @@ -285,8 +285,8 @@ public static Script createOutputScript(byte[] address, int type) { /** * Creates a scriptPubKey that encodes payment to the given raw public key. - * 根据公钥创建一个OutputScript/scriptPublicKry - * 创建P2PK（Pay-to-Public-Key）锁定脚本 + * Create a public key based on itOutputScript/scriptPublicKry + * establishP2PK（Pay-to-Public-Key）Lock Script */ public static Script createOutputScript(ECKey key) { return new ScriptBuilder().data(key.getPubKey()).op(OP_CHECKSIG).build(); @@ -295,7 +295,7 @@ public static Script createOutputScript(ECKey key) { /** * Creates a scriptSig that can redeem a pay-to-address output. * If given signature is null, incomplete scriptSig will be created with OP_0 instead of signature - * 根据签名和公钥创建一个pay-to-address的inputScript/scriptSig用于解锁交易的OutputScript/scriptPublicKry + * Create a signature and public key based on itpay-to-addressofinputScript/scriptSigUsed to unlock transactionsOutputScript/scriptPublicKry */ public static Script createInputScript(@Nullable TransactionSignature signature, ECKey pubKey) { byte[] pubkeyBytes = pubKey.getPubKey(); @@ -307,7 +307,7 @@ public static Script createInputScript(@Nullable TransactionSignature signature, /** * Creates a scriptSig that can redeem a pay-to-address output. * If given signature is null, incomplete scriptSig will be created with OP_0 instead of signature - * 根据签名和公钥创建一个pay-to-address的inputScript/scriptSig用于解锁交易的OutputScript/scriptPublicKry + * Create a signature and public key based on itpay-to-addressofinputScript/scriptSigUsed to unlock transactionsOutputScript/scriptPublicKry */ public static Script createNulsInputScript(@Nullable byte[] signBytes, byte[] pubKeyBytes) { return new ScriptBuilder().data(signBytes).data(pubKeyBytes).build(); @@ -316,7 +316,7 @@ public static Script createNulsInputScript(@Nullable byte[] signBytes, byte[] pu /** * Creates a scriptSig that can redeem a pay-to-pubkey output. * If given signature is null, incomplete scriptSig will be created with OP_0 instead of signature - * 根据签名创建一个pay-to-public_key的inputScript/scriptSig用于解锁交易的OutputScript/scriptPublicKry + * Create a signature based on the signaturepay-to-public_keyofinputScript/scriptSigUsed to unlock transactionsOutputScript/scriptPublicKry */ public static Script createInputScript(@Nullable TransactionSignature signature) { //byte[] sigBytes = signature != null ? signature.encodeToBitcoin() : new byte[]{}; @@ -326,12 +326,12 @@ public static Script createInputScript(@Nullable TransactionSignature signature) /** * Creates a program that requires at least N of the given keys to sign, using OP_CHECKMULTISIG. - * 根据多个公钥创建多重签名的OutputScript/scriptPublicKry + * Creating multiple signatures based on multiple public keysOutputScript/scriptPublicKry */ public static Script createMultiSigOutputScript(int threshold, List pubkeys) { checkArgument(threshold > 0); checkArgument(threshold <= pubkeys.size()); - checkArgument(pubkeys.size() <= 16); // That's the max we can represent with a single opcode.这是我们可以用一个操作码来表示的最大值 + checkArgument(pubkeys.size() <= 16); // That's the max we can represent with a single opcode.This is the maximum value that we can represent with an opcode ScriptBuilder builder = new ScriptBuilder(); builder.smallNum(threshold); for (ECKey key : pubkeys) { @@ -344,12 +344,12 @@ public static Script createMultiSigOutputScript(int threshold, List pubke /** * Creates a program that requires at least N of the given keys to sign, using OP_CHECKMULTISIG. - * 根据多个公钥创建多重签名的OutputScript/scriptPublicKry + * Creating multiple signatures based on multiple public keysOutputScript/scriptPublicKry */ public static Script createNulsMultiSigOutputScript(int threshold, List pubkeys) { checkArgument(threshold > 0); checkArgument(threshold <= pubkeys.size()); - checkArgument(pubkeys.size() <= 16); // That's the max we can represent with a single opcode.这是我们可以用一个操作码来表示的最大值 + checkArgument(pubkeys.size() <= 16); // That's the max we can represent with a single opcode.This is the maximum value that we can represent with an opcode ScriptBuilder builder = new ScriptBuilder(); builder.smallNum(threshold); for (String pubKey : pubkeys) { @@ -362,12 +362,12 @@ public static Script createNulsMultiSigOutputScript(int threshold, List /** * Create a program that satisfies an OP_CHECKMULTISIG program. - * 根据多个签名创建inputScript/scriptSig解锁脚本 + * Create based on multiple signaturesinputScript/scriptSigUnlock Script **/ public static Script createByteNulsMultiSigOutputScript(int threshold, List pubkeys) { checkArgument(threshold > 0); checkArgument(threshold <= pubkeys.size()); - checkArgument(pubkeys.size() <= 16); // That's the max we can represent with a single opcode.这是我们可以用一个操作码来表示的最大值 + checkArgument(pubkeys.size() <= 16); // That's the max we can represent with a single opcode.This is the maximum value that we can represent with an opcode ScriptBuilder builder = new ScriptBuilder(); builder.smallNum(threshold); for (byte[] pubkey : pubkeys) { @@ -380,7 +380,7 @@ public static Script createByteNulsMultiSigOutputScript(int threshold, List signatures) { List sigs = new ArrayList(signatures.size()); @@ -407,14 +407,14 @@ public static Script createMultiSigInputScriptBytes(List signatures) { /** * Create a program that satisfies a pay-to-script hashed OP_CHECKMULTISIG program. * If given signature list is null, incomplete scriptSig will be created with OP_0 instead of signatures - * P2SH（支付到脚本模式，使用多重签名就需要用到这种模式） + * P2SH（Payment to script mode, which is required for using multiple signatures） */ public static Script createP2SHMultiSigInputScript(@Nullable List signatures, Script multisigProgram) { List sigs = new ArrayList(); if (signatures == null) { // create correct number of empty signatures - int numSigs = multisigProgram.getNumberOfSignaturesRequiredToSpend(); //花费这笔UTXO需要的签名数量 + int numSigs = multisigProgram.getNumberOfSignaturesRequiredToSpend(); //Spend thisUTXONumber of signatures required for (int i = 0; i < numSigs; i++) { sigs.add(new byte[]{}); } @@ -429,14 +429,14 @@ public static Script createP2SHMultiSigInputScript(@Nullable List signatures, Script multisigProgram) { List sigs = new ArrayList(); if (signatures == null) { // create correct number of empty signatures - int numSigs = multisigProgram.getNumberOfSignaturesRequiredToSpend(); //花费这笔UTXO需要的签名数量 + int numSigs = multisigProgram.getNumberOfSignaturesRequiredToSpend(); //Spend thisUTXONumber of signatures required for (int i = 0; i < numSigs; i++) { sigs.add(new byte[]{}); } @@ -532,7 +532,7 @@ public static Script updateScriptWithSignature(Script scriptSig, byte[] signatur * Creates a scriptPubKey that sends to the given script hash. Read * BIP 16 to learn more about this * kind of script. - * 根据hash创建P2SH锁定脚本 + * according tohashestablishP2SHLock Script */ public static Script createP2SHOutputScript(byte[] hash) { checkArgument(hash.length == 23); @@ -541,7 +541,7 @@ public static Script createP2SHOutputScript(byte[] hash) { /** * Creates a scriptPubKey for the given redeem script. - * 根据赎回脚本创建P2SH的锁定脚本 + * Create based on redemption scriptP2SHLock Script for */ /* public static Script createP2SHOutputScript(Script redeemScript) { Address address = new Address(BaseConstant.DEFAULT_CHAIN_ID, BaseConstant.P2SH_ADDRESS_TYPE, SerializeUtils.sha256hash160(redeemScript.getProgram())); @@ -554,7 +554,7 @@ public static Script createP2SHOutputScript(byte[] hash) { * Creates a P2SH output script with given public keys and threshold. Given public keys will be placed in * redeem script in the lexicographical sorting order. *

- * 使用给定的公钥和阈值创建一个P2SH输出脚本。给定公共密钥将被放置在在字典排序顺序中赎回脚本 + * Create a using the given public key and thresholdP2SHOutput script. The given public key will be placed in the dictionary sorting order to redeem the script */ /* public static Script createP2SHOutputScript(int threshold, List pubkeys) { Script redeemScript = createRedeemScript(threshold, pubkeys); diff --git a/common/nuls-base/src/main/java/io/nuls/base/script/ScriptUtil.java b/common/nuls-base/src/main/java/io/nuls/base/script/ScriptUtil.java index 4092229bfa..7b24c9ebe7 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/script/ScriptUtil.java +++ b/common/nuls-base/src/main/java/io/nuls/base/script/ScriptUtil.java @@ -29,21 +29,21 @@ public class ScriptUtil { /** - * 根据交易签名和公钥生成解锁脚本 （P2PSH） + * Generate unlocking scripts based on transaction signatures and public keys （P2PSH） * - * @param sigByte 交易签名 - * @param pubkeyByte 公钥 - * @return Script 生成的解锁脚本 + * @param sigByte Transaction signature + * @param pubkeyByte Public key + * @return Script Generate unlock script */ public static Script createP2PKHInputScript(byte[] sigByte, byte[] pubkeyByte) { return ScriptBuilder.createNulsInputScript(sigByte, pubkeyByte); } /** - * 根据输出地址生成锁定脚本 + * Generate locking script based on output address * - * @param address 输出地址 - * @return Script 生成的锁定脚本 + * @param address Output address + * @return Script The generated locking script */ public static Script createP2PKHOutputScript(byte[] address) { return ScriptBuilder.createOutputScript(address, 1); @@ -51,42 +51,42 @@ public static Script createP2PKHOutputScript(byte[] address) { /** - * M-N多重签名模式下根据多个公钥和M-N生成赎回脚本 + * M-NIn multi signature mode, based on multiple public keys andM-NGenerate redemption script * - * @param pub_keys 公钥列表 - * @param m 表示至少需要多少个签名验证通过 - * @return Script 生成的锁定脚本 + * @param pub_keys Public Key List + * @param m Indicates at least how many signatures are required for verification to pass + * @return Script The generated locking script */ public static Script creatRredeemScript(List pub_keys, int m) { return ScriptBuilder.createNulsRedeemScript(m, pub_keys); } /** - * M-N多重签名模式下根据多个公钥和M-N生成解锁脚本（N就是公钥列表长度） + * M-NIn multi signature mode, based on multiple public keys andM-NGenerate unlock script（NIt's the length of the public key list） * - * @param signatures 签名列表 - * @param multisigProgram 当交易为P2SH时，表示的就是赎回脚本 - * @return Script 生成的解鎖脚本 + * @param signatures Signature List + * @param multisigProgram When the transaction isP2SHWhen, it represents the redemption script + * @return Script Generate unlock script */ public static Script createP2SHInputScript(List signatures, Script multisigProgram) { return ScriptBuilder.createNulsP2SHMultiSigInputScript(signatures, multisigProgram); } /** - * M-N多重签名模式下根据多个公钥和M-N生成锁定脚本（N就是公钥列表长度） + * M-NIn multi signature mode, based on multiple public keys andM-NGenerate lock script（NIt's the length of the public key list） * - * @param redeemScript 贖回腳本 - * @return Script 生成的锁定脚本 + * @param redeemScript Redemption script + * @return Script The generated locking script */ /* public static Script createP2SHOutputScript(Script redeemScript) { return ScriptBuilder.createP2SHOutputScript(redeemScript); }*/ /** - * M-N多重签名模式下，根据输出地址生成锁定脚本 + * M-NIn multi signature mode, generate locking scripts based on output addresses * - * @param address 输出地址 - * @return Script 生成的锁定脚本 + * @param address Output address + * @return Script The generated locking script */ public static Script createP2SHOutputScript(byte[] address) { return ScriptBuilder.createOutputScript(address, 0); @@ -94,7 +94,7 @@ public static Script createP2SHOutputScript(byte[] address) { public static void main(String[] args) { /** - * 脚本序列化测试代码 + * Script serialization test code * */ try { /*TransferTransaction tx = new TransferTransaction(); @@ -147,7 +147,7 @@ public static void main(String[] args) { }*/ /** - * 脚本创建测试代码 + * Script creation test code * */ /* //P2PKHInput byte[] signbyte = "cVLwRLTvz3BxDAWkvS3yzT9pUcTCup7kQnfT2smRjvmmm1wAP6QT".getBytes(); @@ -174,7 +174,7 @@ public static void main(String[] args) { System.out.println(redeemScript.getProgram().length); Script p2shInput = createP2SHInputScript(signBytes, redeemScript); System.out.println("P2SH_INPUT:" + p2shInput.getChunks()); - ScriptChunk scriptChunk = p2shInput.getChunks().get(p2shInput.getChunks().size() - 1); //scriptChunk.data存放的就是赎回脚本的序列化信息 + ScriptChunk scriptChunk = p2shInput.getChunks().get(p2shInput.getChunks().size() - 1); //scriptChunk.dataWhat is stored is the serialization information of the redemption script Script redeemScriptParse = new Script(scriptChunk.entity); System.out.println(redeemScriptParse.getChunks()); //P2SHOutput @@ -184,12 +184,12 @@ public static void main(String[] args) { System.out.println(Arrays.toString(SerializeUtils.sha256hash160("03a690c7f3b07e320566162b0ff7d79c8c9f453c0a4a13305fcd90f4e4f4cf215c".getBytes()))); */ /** - * P2PKH脚本验证测试代码 + * P2PKHScript validation test code * */ /* Na values = Na.valueOf(10); - byte[] from = "".getBytes(); //输入地址 - byte[] to = "".getBytes(); //输出地址 - String pub_key = ""; //输入账户公钥 + byte[] from = "".getBytes(); //Enter address + byte[] to = "".getBytes(); //Output address + String pub_key = ""; //Enter account public key String password =""; String remark =""; Na price = Na.valueOf(5); @@ -204,7 +204,7 @@ public static void main(String[] args) { CoinDataResult coinDataResult = accountLedgerService.getCoinData(from, values, tx.size() + + coinData.size(), price); if (!coinDataResult.isEnough()) { //return Result.getFailed(AccountLedgerErrorCode.INSUFFICIENT_BALANCE); - System.out.println("余额不足！"); + System.out.println("Insufficient balance！"); return; } coinData.setFrom(coinDataResult.getCoinList()); @@ -215,7 +215,7 @@ public static void main(String[] args) { tx.setHash(NulsHash.calcHash(tx.serializeForHash())); P2PKHScriptSig sig = new P2PKHScriptSig(); //sig.setPublicKey(account.getPubKey());*/ - //用当前交易的hash和账户的私钥账户 + //Using the current transaction'shashAnd the private key account of the account //sig.setSignData(accountService.signDigest(tx.getHash().getBytes(), account, password)); //tx.setBlockSignature(sig.serialize()); diff --git a/common/nuls-base/src/main/java/io/nuls/base/signture/MultiSignTxSignature.java b/common/nuls-base/src/main/java/io/nuls/base/signture/MultiSignTxSignature.java index 21f8374cd3..9db37c8524 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/signture/MultiSignTxSignature.java +++ b/common/nuls-base/src/main/java/io/nuls/base/signture/MultiSignTxSignature.java @@ -35,19 +35,19 @@ import java.util.List; /** - * 多签账户签名 + * Multiple account signatures * @author: Charlie * @date: 2018-12-12 */ public class MultiSignTxSignature extends TransactionSignature { /** - * 多签地址需要M个公钥的签名可以解锁 + * Multiple address signatures are requiredMThe signature of a public key can be unlocked */ private byte m; /** - * 生成多签地址所有的公钥 + * Generate all public keys for multiple signed addresses */ private List pubKeyList; @@ -100,7 +100,7 @@ public void addPubkey(byte[] pubkey) { } /** - * 签名验证 + * Signature verification * */ public List getValidSignature(){ if(m <= 0 || pubKeyList == null || pubKeyList.size() == 0 || m>pubKeyList.size()){ diff --git a/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java b/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java index 45119469ad..53673ba921 100644 --- a/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java +++ b/common/nuls-base/src/main/java/io/nuls/base/signture/SignatureUtil.java @@ -46,7 +46,7 @@ import java.util.*; /** - * 交易签名工具类 + * Transaction signature tool class * Transaction Signature Tool Class * * @author tag @@ -58,13 +58,13 @@ public class SignatureUtil { private static final int MAIN_CHAIN_ID = 1; /** - * 验证交易中所有签名正确性 + * Verify the correctness of all signatures in the transaction * - * @param chainId 当前链ID - * @param tx 交易 + * @param chainId Current ChainID + * @param tx transaction */ public static boolean validateTransactionSignture(int chainId, Transaction tx) throws NulsException { - // 判断硬分叉,需要一个高度 + // Determine hard fork,Need a height long hardForkingHeight = 878000; boolean forked = tx.getBlockHeight() <= 0 || tx.getBlockHeight() > hardForkingHeight; if (chainId != MAIN_CHAIN_ID) { @@ -81,7 +81,7 @@ public static boolean validateTransactionSignture(int chainId, Transaction tx) t throw new NulsException(new Exception("Transaction unsigned ！")); } if (forked) { - //这里用硬分叉后的新逻辑 + //The new logic after using hard forks here for (P2PHKSignature signature : transactionSignature.getP2PHKSignatures()) { if (!ECKey.verify(tx.getHash().getBytes(), signature.getSignData().getSignBytes(), signature.getPublicKey())) { throw new NulsException(new Exception("Transaction signature error !")); @@ -129,9 +129,9 @@ public static boolean validateTransactionSignture(int chainId, Transaction tx) t } /** - * 跨链交易验证签名 + * Cross chain transaction verification signature * - * @param tx 交易 + * @param tx transaction */ public static boolean ctxSignatureValid(int chainId, Transaction tx) throws NulsException { if (tx.getTransactionSignature() == null || tx.getTransactionSignature().length == 0) { @@ -167,9 +167,9 @@ public static boolean ctxSignatureValid(int chainId, Transaction tx) throws Nuls } /** - * 跨链交易验证签名 + * Cross chain transaction verification signature * - * @param tx 交易 + * @param tx transaction */ public static boolean validateCtxSignture(Transaction tx) throws NulsException { if (tx.getTransactionSignature() == null || tx.getTransactionSignature().length == 0) { @@ -189,7 +189,7 @@ public static boolean validateCtxSignture(Transaction tx) throws NulsException { } /** - * 验证数据签名 + * Verify data signature * * @param digestBytes * @param p2PHKSignature @@ -207,9 +207,9 @@ public static boolean validateSignture(byte[] digestBytes, P2PHKSignature p2PHKS } /** - * 判断交易是否存在某地址 + * Determine if a certain address exists in the transaction * - * @param tx 交易 + * @param tx transaction */ public static boolean containsAddress(Transaction tx, byte[] address, int chainId) throws NulsException { Set addressSet = getAddressFromTX(tx, chainId); @@ -220,9 +220,9 @@ public static boolean containsAddress(Transaction tx, byte[] address, int chainI } /** - * 获取交易签名地址 + * Obtain transaction signature address * - * @param tx 交易 + * @param tx transaction */ public static Set getAddressFromTX(Transaction tx, int chainId) throws NulsException { Set addressSet = new HashSet<>(); @@ -257,7 +257,7 @@ public static Set getAddressFromTX(Transaction tx, int chainId) throws N } /** - * 验证签名（不包含多签），如果签名验证通过则返回签名中的地址 + * Verify signature（Excluding multiple signatures）If the signature verification is successful, return the address in the signature * @param chainId * @param data * @param signatureBytes @@ -295,7 +295,7 @@ public static Set getAddressesAndVerifySignature(int chainId, byte[] dat } /** - * 从签名中提取地址列表（不验证签名） + * Extract address list from signature（Do not verify signature） * @param chainId * @param signatureBytes * @return @@ -324,10 +324,10 @@ public static Set getAddressesFromSignature(int chainId, byte[] signatu return addressSet; } /** - * 生成交易TransactionSignture + * Generate transactionsTransactionSignture * - * @param tx 交易 - * @param signEckeys 需要生成普通签名的秘钥 + * @param tx transaction + * @param signEckeys A key that needs to generate a regular signature */ public static void createTransactionSignture(Transaction tx, List signEckeys) throws IOException { if (signEckeys == null || signEckeys.size() == 0) { @@ -347,10 +347,10 @@ public static void createTransactionSignture(Transaction tx, List signEck } /** - * 生成交易多个传统签名（多地址转账可能会用到） + * Generate multiple traditional signatures for transactions（Multiple address transfers may require） * - * @param tx 交易 - * @param eckeys 秘钥列表 + * @param tx transaction + * @param eckeys Key List */ public static List createSignaturesByEckey(Transaction tx, List eckeys) { List signatures = new ArrayList<>(); @@ -369,30 +369,30 @@ public static List createSignaturesByEckey(NulsHash hash, List createInputScripts(List signtures, List pubkeys) { List