From e1c8e3212d16c3e9b573a3006152813a47d2c982 Mon Sep 17 00:00:00 2001
From: springrain <chunanyong@163.com>
Date: Sun, 10 Jul 2022 10:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=AE=BE=E7=BD=AE=20txVsersion=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=B8=BA=201,=E6=8E=92=E9=99=A4=E6=8E=89?=
 =?UTF-8?q?=E4=BD=8E=E7=89=88=E6=9C=ACguava=E4=BE=9D=E8=B5=96,=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8grpc=E7=9A=84guava=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          | 7 +++++++
 src/main/java/com/baidu/xuper/config/Config.java | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b7df125..20d0059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,6 +228,13 @@
             <groupId>org.apache.fluo</groupId>
             <artifactId>fluo-api</artifactId>
             <version>1.2.0</version>
+            <!-- 排除掉低版本guava依赖,使用grpc的guava依赖 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
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() {