Merge pull request #461 from dpneko/feature/set_multi_sign_address

feat: set multi sign address

Author: CodeNinjaEvan

sun-sdk/src/main/java/org/tron/core/config/Configuration.java

@@ -64,4 +64,24 @@ public static Config getByPath(final String configurationPath) {
     }
     return config;
   }
+
+  public static Config getByPathNoCache(final String configurationPath) {
+    if (isBlank(configurationPath)) {
+      throw new IllegalArgumentException("Configuration path is required!");
+    }
+    Config localConfig = null;
+    File configFile = new File(System.getProperty("user.dir")+'/'+configurationPath);
+    if(configFile.exists()){
+      try {
+        localConfig = ConfigFactory.parseReader(new InputStreamReader(new FileInputStream(configurationPath)));
+        logger.info("use user defined config file in current dir");
+      } catch (FileNotFoundException e) {
+        logger.error("load user defined config file exception: " + e.getMessage());
+      }
+    }else {
+      localConfig = ConfigFactory.load(configurationPath);
+      logger.info("user defined config file doesn't exists, use default config file in jar");
+    }
+    return localConfig;
+  }
 }

sun-sdk/src/main/java/org/tron/sunapi/Chain.java

@@ -105,6 +105,20 @@ public SunNetworkResponse<Integer> setPrivateKey(String priKey) {
     return ret.success(0);
   }
 
+  public SunNetworkResponse<Integer> setPrivateKey(String priKey, String address) {
+    SunNetworkResponse<Integer> ret = new SunNetworkResponse<>();
+    byte[] temp = ByteArray.fromHexString(priKey);
+    byte[] tempAddress = AddressUtil.decodeFromBase58Check(address);
+
+    if (!Utils.priKeyValid(temp)) {
+      ret.failed(ErrorCodeEnum.COMMON_PARAM_ERROR);
+    }
+
+    this.serverApi.initPrivateKey(temp, tempAddress);
+
+    return ret.success(0);
+  }
+
   /**
    * @param request request of deploy contract
    * @return the response of deploy contract which contains the address of contract deployed

sun-sdk/src/main/java/org/tron/sunapi/SunNetwork.java

@@ -52,4 +52,17 @@ public SunNetworkResponse<Integer> setPrivateKey(String priKey) {
 
     return ret;
   }
+
+  public SunNetworkResponse<Integer> setPrivateKey(String priKey, String address) {
+    SunNetworkResponse<Integer> ret;
+
+    ret = this.mainChainService.setPrivateKey(priKey, address);
+    if (!ret.getCode().equals(ErrorCodeEnum.SUCCESS.getCode())) {
+      return ret;
+    }
+
+    ret = this.sideChainService.setPrivateKey(priKey, address);
+
+    return ret;
+  }
 }

sun-sdk/src/main/java/org/tron/sunserver/ServerApi.java

@@ -167,6 +167,12 @@ public void initPrivateKey(byte[] priKey) {
     this.address = priEcKey.getAddress();
   }
 
+  public void initPrivateKey(byte[] priKey, byte[] address) {
+    this.priEcKey = ECKey.fromPrivate(priKey);
+
+    this.address = address;
+  }
+
   public ServerApi(IServerConfig config, byte[] priKey, boolean isMainChain,
       IMultiTransactionSign multiTransactionSign) {
     this.isMainChain = isMainChain;