Pre master

README.md

@@ -2,22 +2,11 @@
 
 ## 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 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
 
@@ -60,30 +49,16 @@ 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
 
 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 +76,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

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;

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<String, ContractAddressInfoPo> CONTRACT_INFO_CACHE;
  private static ContractHelper contractHelper;
 

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();

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"
  }
 ]

version

@@ -1 +1 @@
-2.16.2
+2.17.0