Merge branch 'master' of https://gitee.com/BDWare/common

build.gradle

@@ -53,6 +53,7 @@ dependencies {
 }
 group = "org.bdware.sc"
 version = "1.5.8"
+
 tasks.processResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
 
 task copyLibs(type: Copy) {

src/main/base/org/bdware/sc/node/ContractNode.java

@@ -192,4 +192,8 @@ public class ContractNode {
     public void setInstrumentBranch(boolean b) {
         instrumentBranch = b;
     }
+
+    public void resetContractName(String name) {
+        contractName = name;
+    }
 }

src/main/base/org/bdware/sc/node/FunctionNode.java

@@ -103,7 +103,7 @@ public class FunctionNode extends Script {
 
     public void addArg(String arg) {
         args.add(arg);
-        if (arg.equals("requester")) {
+        if (isExport && arg.equals("requester")) {
             throw new IllegalArgumentException("The argument shouldn't be requester");
         }
     }

src/main/base/org/bdware/sc/node/Permission.java

@@ -17,7 +17,8 @@ public enum Permission {
     CM,
     DOIP,
     IRP,
-    Async;
+    Async,
+    Cluster;
 
     public static Permission parse(String str) {
         try {