diff --git a/pom.xml b/pom.xml index b7df125..20d0059 100644 --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,13 @@ org.apache.fluo fluo-api 1.2.0 + + + + com.google.guava + guava + + diff --git a/src/main/java/com/baidu/xuper/config/Config.java b/src/main/java/com/baidu/xuper/config/Config.java index a79d2ac..02c725d 100644 --- a/src/main/java/com/baidu/xuper/config/Config.java +++ b/src/main/java/com/baidu/xuper/config/Config.java @@ -17,7 +17,7 @@ public class Config { private ComplianceCheck complianceCheck; private String minNewChainAmount; private String crypto; - private Integer txVersion; + private Integer txVersion=1; private Config() { } @@ -50,7 +50,12 @@ public static Config getInstance() { private static Config getConfigFromYaml() throws Exception { Yaml yaml = new Yaml(new Constructor(Config.class)); - return yaml.load(new FileInputStream(new File(confFilePath))); + Config config= yaml.load(new FileInputStream(new File(confFilePath))); + if (config.getTxVersion()==null){ + config.setTxVersion(1); + } + return config; + //return yaml.load(new FileInputStream(new File(confFilePath))); } private static Config getDefaultConfig() {