nuls-io · jasonchou82111 · Aug 15, 2024 · Dec 27, 2021 · May 25, 2022 · May 25, 2022
diff --git a/README.md b/README.md
@@ -1,33 +1,24 @@
-# NULS 2.0
 
-## Welcome to NULS! ##
+# NULS2.0 Node Wallet Implemented in Java
 
+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:/nuls-io/nuls-v2/tree/master/module/nuls-cores/src/main/java/io/nuls
 
-## 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.
 
 ## Getting Started
 
-test
+Start a NULS node according to this boot.
 
 ### Download Release
 
 Download URL: [RELEASES](https:/nuls-io/nuls-v2/releases)
 
-## Running NULS 2.0
+## Running NULS2.0
 
 ### Bootstrap
 
@@ -58,58 +49,69 @@ Note: The command will automatically end when all modules are started.
 
 ## Docker Quick Start
 
-Stay tuned
-
-## Explorer and Web Wallet
+Stay tuned. Join Discord to find out.
 
-Explorer URL: [http://beta.nulscan.io/](http://beta.nulscan.io/)
+## Explorer
 
-Web Wallet: [http://beta.wallet.nuls.io/](http://beta.wallet.nuls.io/)
+Explorer URL: [https://nulscan.io/](https://nulscan.io/)
 
 ## ChainBox Tutorial
 
 Please check the following documents：
 
 [https://docs.nuls.io/NULS2.0/chainBoxGuide.html](https://docs.nuls.io/NULS2.0/chainBoxGuide.html)
 
-## Debug
+## Modules Description
 
-Stay tuned
+Please check the following documents:
 
-## Configuration
+[https://docs.nuls.io/Docs/c_module.html](https://docs.nuls.io/Docs/c_module.html)
 
-Stay tuned
+Note: Some documents are in the process of being updated, so please understand if there are some inconsistencies.
 
-## Interfaces
+## Contribute to NULS2.0
+Click Star and Fork to start contributing improvements to NULS v2.
+Hope more contributors can submit improvement suggestions and bug reports here.
+Issues: https:/nuls-io/nuls-v2/issues
 
-Stay tuned
 
-## Modules Description
 
-Please check the following documents:
+# Welcome to NULS! #
 
-[https://docs.nuls.io/Docs/c_module.html](https://docs.nuls.io/Docs/c_module.html)
+NULS — Making It Easier To Innovate
 
-Note: Some documents are in the process of being updated, so please understand if there are some inconsistencies.
+## 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
 
-## 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.
 
 ## 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
 
-- [nuls.io](https://nuls.io/)
-- [@Twitter](https://twitter.com/nulsservice)
-- [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 Chinese community](https://t.me/Nulscn)
-
-#### 
+- 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:/nuls-io
 
-test
+#### 
diff --git a/build/nulstar/start.sh b/build/nulstar/start.sh
@@ -9,7 +9,7 @@ if [ ! -f "${CONFIG}" ] ; then
  exit 0
 fi
 availableMem=`free | awk '/Mem/ {print $7}'`
-xmsMem=6000000
+xmsMem=4000000
 if [ "$availableMem" -lt $xmsMem ]
 then
  echo "available mem must be equal or greater than ${xmsMem}KB";

diff --git a/...on/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockService.java b/...on/nuls-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockService.java
@@ -20,5 +20,5 @@ public interface BlockService {
  Result<BlockHeaderData> getBlockHeaderByLastHeight(GetBlockHeaderByLastHeightReq req);
 
 
- Result<BlockHeaderData> rollback(GetBlockHeaderByHeightReq getBlockHeaderByHeightReq);
+ Result rollback(GetBlockHeaderByHeightReq getBlockHeaderByHeightReq);
 }
diff --git a/...s-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java b/...s-base-api-provider/src/main/java/io/nuls/base/api/provider/block/BlockServiceForRpc.java
@@ -49,8 +49,8 @@ public Result<BlockHeaderData> getBlockHeaderByLastHeight(GetBlockHeaderByLastHe
  }
 
  @Override
- public Result<BlockHeaderData> rollback(GetBlockHeaderByHeightReq req) {
- return _call("roll_back", req, this::tranderBlockHeader);
+ public Result rollback(GetBlockHeaderByHeightReq req) {
+ return _call("roll_back", req, this::tranderString);
  }
 
  @Override
@@ -62,6 +62,14 @@ private Result<BlockHeaderData> _call(String method, Object req, Function<Map, R
  return call(method, req, callback);
  }
 
+ private Result<String> tranderString(Map result) {
+ String hexString = (String) result.get("value");
+ if (StringUtils.isBlank(hexString)) {
+ return success(null);
+ }
+ return success(hexString);
+ }
+
  private Result<BlockHeaderData> tranderBlockHeader(Map result) {
  try {
  String hexString = (String) result.get("value");

diff --git a/.../nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java b/.../nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/cmd/MessageDispatcher.java
@@ -62,7 +62,11 @@ public Response msgProcess(Map params) {
  String msgStr = (String) params.get("messageBody");
  for (MessageProcessor processor : processors) {
  if (cmd.equals(processor.getCmd())) {
- processor.process(chainId, nodeId, msgStr);
+ try {
+ processor.process(chainId, nodeId, msgStr);
+ } catch (Exception e) {
+ Log.error("", e);
+ }
  }
  }
  return success();

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
@@ -29,6 +29,7 @@
 import io.nuls.base.signture.P2PHKSignature;
 import io.nuls.core.exception.NulsRuntimeException;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 
@@ -38,18 +39,19 @@
  */
 public class TransactionFeeCalculator {
 
- public static final BigInteger NORMAL_PRICE_PRE_1024_BYTES = BigInteger.valueOf(100000);
  public static final BigInteger CROSSTX_PRICE_PRE_1024_BYTES = BigInteger.valueOf(1000000);
 
  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 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)));
+ public static final BigInteger getNormalTxFee(int size, long feeUnit) {
+ BigInteger NORMAL_PRICE_PRE_1024_BYTES = BigInteger.valueOf(feeUnit);
+ BigInteger fee = NORMAL_PRICE_PRE_1024_BYTES.multiply(new BigInteger(String.valueOf(size / KB)));
  if (size % KB > 0) {
  fee = fee.add(NORMAL_PRICE_PRE_1024_BYTES);
  }
@@ -59,11 +61,12 @@ 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 Transaction size/size of the transaction
  */
- public static final BigInteger getConsensusTxFee(int size,long unit) {
+ public static final BigInteger getConsensusTxFee(int size, long unit) {
  BigInteger unitBigInteger = BigInteger.valueOf(unit);
- BigInteger fee = unitBigInteger.multiply(new BigInteger(String.valueOf(size/KB)));
+ BigInteger fee = unitBigInteger.multiply(new BigInteger(String.valueOf(size / KB)));
  if (size % KB > 0) {
  fee = fee.add(unitBigInteger);
  }
@@ -72,25 +75,32 @@ public static final BigInteger getConsensusTxFee(int size,long unit) {
 
  /**
  * 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) {
+ public static final BigInteger getNormalUnsignedTxFee(int size, long feeUnit, double feeCoefficient) {
+ BigInteger NORMAL_PRICE_PRE_1024_BYTES = BigInteger.valueOf(feeUnit);
  size += P2PHKSignature.SERIALIZE_LENGTH;
- BigInteger fee = NORMAL_PRICE_PRE_1024_BYTES.multiply(new BigInteger(String.valueOf(size/KB)));
+ BigInteger fee = NORMAL_PRICE_PRE_1024_BYTES.multiply(new BigInteger(String.valueOf(size / KB)));
  if (size % KB > 0) {
  fee = fee.add(NORMAL_PRICE_PRE_1024_BYTES);
  }
+ if (1 != feeCoefficient) {
+ BigDecimal deci = BigDecimal.valueOf(feeCoefficient);
+ fee = deci.multiply(new BigDecimal(fee)).toBigInteger();
+ }
  return fee;
  }
 
  /**
  * Calculate the required transaction fees based on the size of the transaction
  * According to the transaction size calculate the handling fee.
+ *
  * @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)));
+ BigInteger fee = CROSSTX_PRICE_PRE_1024_BYTES.multiply(new BigInteger(String.valueOf(size / KB)));
  if (size % KB > 0) {
  fee = fee.add(CROSSTX_PRICE_PRE_1024_BYTES);
  }
@@ -100,16 +110,18 @@ 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 Transaction size/size of the transaction
  */
- public static final BigInteger getFee(int size, BigInteger price) {
- if(price.compareTo(NORMAL_PRICE_PRE_1024_BYTES)<0){
+ public static final BigInteger getFee(int size, BigInteger price, long feeUnit) {
+ BigInteger NORMAL_PRICE_PRE_1024_BYTES = BigInteger.valueOf(feeUnit);
+ if (price.compareTo(NORMAL_PRICE_PRE_1024_BYTES) < 0) {
  throw new NulsRuntimeException(new Exception("entity is error"));
  }
- if(price.compareTo(CROSSTX_PRICE_PRE_1024_BYTES)>0) {
+ if (price.compareTo(CROSSTX_PRICE_PRE_1024_BYTES) > 0) {
  throw new NulsRuntimeException(new Exception("entity is error"));
  }
- BigInteger fee = price.multiply(new BigInteger(String.valueOf(size/KB)));
+ BigInteger fee = price.multiply(new BigInteger(String.valueOf(size / KB)));
  if (size % KB > 0) {
  fee = fee.add(price);
  }

diff --git a/...nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/RequestMessageProcessor.java b/...nuls-core-rpc/src/main/java/io/nuls/core/rpc/netty/processor/RequestMessageProcessor.java
@@ -517,11 +517,11 @@ private static Response invoke(String invokeClass, String invokeMethod, Map para
  return MessageUtil.newFailResponse("", CMD_NOT_FOUND);
  }
  long start = System.currentTimeMillis();
- Log.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
- Log.info("-=-=-=-::{},{}",method.toString(),cmd.getClass().getName());
- Log.info("-=-=-=-::{}",JSONUtils.obj2json(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());
+// 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;

diff --git a/common/nuls-core/pom.xml b/common/nuls-core/pom.xml
@@ -166,13 +166,13 @@
  <dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>33.2.1-jre</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>commons-net</groupId>
  <artifactId>commons-net</artifactId>
- <version>3.6</version>
+ <version>3.9.0</version>
  </dependency>
  <dependency>
  <groupId>commons-codec</groupId>

diff --git a/config/nuls.beta.ncf b/config/nuls.beta.ncf
@@ -32,10 +32,10 @@ port=18001
 crossPort=18002
 #Magic parameters
 packetMagic=20200120
-#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
+#种子节点
+selfSeedIps=seedt1.nuls.io:18001,seedt2.nuls.io:18001,seedt3.nuls.io:18001
+#主网的跨链种子连接节点
+moonSeedIps=seedt1.nuls.io:18002,seedt2.nuls.io:18002,seedt3.nuls.io:18002
 #Maximum number of network connections
 maxInCount=100
 #Maximum number of outbound connections
@@ -77,8 +77,6 @@ agentChainId=2
 agentAssetId=1
 #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
 #Initial inflation amount500w/265*30
@@ -89,13 +87,16 @@ initTime=1594483200
 deflationRatio=0.4
 #Deflation interval time(unit：S),30day
 deflationTimeInterval=2592000
-
+feeAssets=2-1,2-201,2-202
+feeUnit=100000,10000,100000000000000
 
 [smart-contract]
 #The maximum consumption of contract view method callsGas
 maxViewGas=100000000
 systemLogLevel=WARN
 crossTokenSystemContract=tNULSeBaMy9k29Nj4rd3U4tonVr93mrDLHMNNd
+# 单位gasPrice小数点位移
+feeCoefficient=1,0.0001,10000000
 
 [public-service]
 #public-serviceModule ExternalrpcPort number
@@ -127,7 +128,7 @@ 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
+crossSeedIps=seedt1.nuls.io:18001,seedt2.nuls.io:18001,seedt3.nuls.io:18001
 #List of main network validators
 verifiers=tNULSeBaMkrt4z9FYEkkR9D6choPVvQr94oYZp,tNULSeBaMmShSTVwbU4rHkZjpD98JgFgg6rmhF,tNULSeBaMoGr2RkLZPfJeS5dFzZeNj1oXmaYNe
 #Main network signature Byzantine comparison